Merge branch 'feature/Feature-sales' of https://gogs.zfire.top/zfire-front/supply-front into feature/Feature-sales

# Conflicts:
#	src/views/sales_policy/components/AddCondition.vue
#	src/views/sales_policy/components/AddPolicy.vue
#	src/views/sales_policy/components/Distributor.vue
#	src/views/sales_policy/components/Examine.vue
#	src/views/sales_policy/components/Transfer.vue
#	src/views/sales_policy/policy_list.vue

src/api/supply/retail.js

@@ -16,4 +16,103 @@ export function getDetail(params) {
     method: 'get',
     params
   })
+}
+
+// 关闭
+export function closeData(params) {
+  return request({
+    url: '/retail/close',
+    method: 'post',
+    params
+  })
+}
+
+// 审批
+export function examineData(params) {
+  return request({
+    url: '/retail/examine',
+    method: 'post',
+    params
+  })
+}
+
+// 退订
+export function returnData(params) {
+  return request({
+    url: '/retail/return',
+    method: 'post',
+    params
+  })
+}
+
+// 提交审核
+export function submitData(params) {
+  return request({
+    url: '/retail/submit',
+    method: 'post',
+    params
+  })
+}
+
+// 新增
+export function addData(params) {
+  return request({
+    url: '/retail/add',
+    method: 'post',
+    data: params
+  })
+}
+
+// 编辑
+export function editData(params) {
+  return request({
+    url: '/retail/update',
+    method: 'post',
+    data: params
+  })
+}
+
+// 获取销售类型列表
+export function getSalesTypeList(params) {
+  return request({
+    url: '/sale/type/list',
+    method: 'get',
+    params
+  })
+}
+
+// 获取产品列表
+export function getGoodsList(params) {
+  return request({
+    url: '/retail/product/list',
+    method: 'get',
+    params
+  })
+}
+
+// 获取钱包列表
+export function getWalletList(params) {
+  return request({
+    url: '/wallet/customer/list',
+    method: 'get',
+    params
+  })
+}
+
+// 获取仓库列表
+export function getWarehouseList(params) {
+  return request({
+    url: '/stock/listStock',
+    method: 'get',
+    params
+  })
+}
+
+// 检查库存
+export function checkStock(params) {
+  return request({
+    url: '/stock/manager/stockStatus',
+    method: 'get',
+    params
+  })
 }

src/layout/components/AppMain.vue

@@ -1,9 +1,9 @@
 <template>
   <section class="app-main">
     <transition name="fade-transform" mode="out-in">
-      <keep-alive :include="cachedViews">
+      <!-- <keep-alive :include="cachedViews"> -->
         <router-view :key="key" />
-      </keep-alive>
+      <!-- </keep-alive> -->
     </transition>
   </section>
 </template>

src/views/finance/account_list.vue

@@ -135,7 +135,7 @@
             ></el-table-column>
             <el-table-column
               align="center"
-              label="首付款金额"
+              label="收付款金额"
               prop=""
               min-width="160"
               show-overflow-tooltip

src/views/finance/balance_sum.vue

@@ -1,148 +1,125 @@
 <template>
   <div class="app-container">
-    <div v-if="showDetail">
-      <!-- 筛选条件 -->
-      <div>
-        <el-form
-          ref="searchForm"
-          :model="searchForm"
-          label-width="100px"
-          size="small"
-          label-position="left"
+    <!-- 筛选条件 -->
+    <div>
+      <el-form
+        ref="searchForm"
+        :model="searchForm"
+        label-width="100px"
+        size="small"
+        label-position="left"
+      >
+        <el-row :gutter="20">
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="经销商名称" prop="">
+              <el-input placeholder="请输入经销商名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="经销商编码" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="24" :lg="24">
+            <el-form-item label="" class="fr">
+              <el-button size="small">清空</el-button>
+              <el-button size="small" type="primary">搜索</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- 按钮 -->
+    <div class="btn-group clearfix">
+      <div class="fr">
+        <el-button type="primary" size="small">导出</el-button>
+        <el-button type="primary" size="small" @click="seeFN">明细</el-button>
+        <el-button type="primary" size="small" @click="walletFn"
+          >余额</el-button
         >
-          <el-row :gutter="20">
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商名称" prop="">
-                <el-input placeholder="请输入经销商名称"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商编码" prop="">
-                <el-input placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="24" :lg="24">
-              <el-form-item label="" class="fr">
-                <el-button size="small">清空</el-button>
-                <el-button size="small" type="primary">搜索</el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
       </div>
-      <!-- 按钮 -->
-      <div class="btn-group clearfix">
-        <div class="fr">
-          <el-button type="primary" size="small">导出</el-button>
-          <el-button type="primary" size="small" @click="seeFN"
-            >查看明细</el-button
+    </div>
+    <!-- 列表 -->
+    <div class="mymain-container">
+      <div class="table">
+        <el-table
+          v-loading="listLoading"
+          :data="dataList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+        >
+          <el-table-column
+            align="center"
+            label="经销商编码"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="经销商名称"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="起初金额"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="总金额"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="更新时间"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+
+          <el-table-column
+            align="center"
+            label="操作"
+            min-width="160"
+            show-overflow-tooltip
           >
-        </div>
+            <template slot-scope=""> </template>
+            <el-button type="text" class="textColor" slot="reference">
+              余额
+            </el-button>
+            <el-button type="text" class="textColor" slot="reference">
+              明细
+            </el-button>
+          </el-table-column>
+        </el-table>
       </div>
-      <!-- 列表 -->
-      <div class="mymain-container">
-        <div class="table">
-          <el-table
-            v-loading="listLoading"
-            :data="dataList"
-            element-loading-text="Loading"
-            border
-            fit
-            highlight-current-row
-            stripe
-          >
-            <el-table-column
-              align="center"
-              label="经销商编码"
-              prop=""
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="经销商名称"
-              prop=""
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="起初金额"
-              prop=""
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="总金额"
-              prop=""
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="普通钱包"
-              prop=""
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="特殊钱包"
-              prop=""
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="返利钱包"
-              prop=""
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="更新时间"
-              prop=""
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="操作"
-              min-width="160"
-              show-overflow-tooltip
-            >
-              <template slot-scope=""> </template>
-              <el-button type="text" class="textColor" slot="reference">
-                查看明细
-              </el-button>
-            </el-table-column>
-          </el-table>
-        </div>
-        <!-- 分页 -->
-        <div class="fr">
-          <el-pagination
-            :current-page="currentPage"
-            :page-sizes="[10, 20, 30, 50]"
-            :page-size="10"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="listTotal"
-          >
-          </el-pagination>
-        </div>
+      <!-- 分页 -->
+      <div class="fr">
+        <el-pagination
+          :current-page="currentPage"
+          :page-sizes="[10, 20, 30, 50]"
+          :page-size="10"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="listTotal"
+        >
+        </el-pagination>
       </div>
     </div>
-    <BalanceSumDetail v-else />
   </div>
 </template>
 
 <script>
-import BalanceSumDetail from "./components/balance_sum-detail";
 export default {
-  components: {
-    BalanceSumDetail,
-  },
   data() {
     return {
       currentPage: 1, // 当前页码
@@ -151,12 +128,15 @@ export default {
       dataList: [], // 列表数据
       searchForm: {}, //搜索表单
       listLoading: false, // 列表加载loading
-      showDetail: true,
     };
   },
   methods: {
+    //余额
+    walletFn() {
+      this.$router.push("/finance/wallet");
+    },
     seeFN() {
-      this.showDetail = false;
+      this.$router.push("/finance/standbook_list");
     },
   },
 };

src/views/finance/change_apply.vue

@@ -0,0 +1,106 @@
+<template>
+  <div class="app-container">
+    <span>返利互转单</span>
+    <el-divider></el-divider>
+    <!-- 筛选条件 -->
+    <div>
+      <el-form
+        ref="searchForm"
+        :model="searchForm"
+        label-width="100px"
+        size="small"
+        label-position="left"
+      >
+        <el-row :gutter="20">
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="返利互转单号" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="单据日期" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="制单人" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="经销商编号" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="经销商名称" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="备注信息" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- 列表 -->
+    <div class="mymain-container">
+      <div class="table">
+        <el-table
+          v-loading="listLoading"
+          :data="dataList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+        >
+          <el-table-column
+            label="序号"
+            align="center"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="返利类型"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="返利金额"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="备注"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <!-- 按钮 -->
+    <div class="btn-group clearfix">
+      <div class="fl">
+        <el-button type="primary" size="small">保存</el-button>
+        <el-button type="primary" size="small">提交申请</el-button>
+        <el-button type="primary" size="small">重置</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {};
+</script>
+
+<style>
+</style>

src/views/finance/change_list.vue

@@ -0,0 +1,259 @@
+<template>
+  <div class="app-container">
+    <div v-if="showPage == 1">
+      <el-radio-group v-model="category" size="">
+        <el-radio-button label="全部"></el-radio-button>
+        <el-radio-button label="待审核"></el-radio-button>
+        <el-radio-button label="审核通过"></el-radio-button>
+        <el-radio-button label="复核通过"></el-radio-button>
+        <el-radio-button label="驳回"></el-radio-button>
+      </el-radio-group>
+      <br /><br />
+      <!-- 筛选条件 -->
+      <div>
+        <el-form
+          ref="searchForm"
+          :model="searchForm"
+          label-width="100px"
+          size="small"
+          label-position="left"
+        >
+          <el-row :gutter="20">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="返利互转单号" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="返利互转单号" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="返利类型" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="申请日期" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :xs="24" :sm="12" :lg="24">
+              <el-form-item label="" class="fr">
+                <el-button size="small">清空</el-button>
+                <el-button size="small" type="primary">搜索</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <!-- 按钮 -->
+      <div class="btn-group clearfix">
+        <div class="fl">
+          <el-button type="primary" size="small" @click="examineFn"
+            >审核</el-button
+          >
+          <el-button type="primary" size="small" @click="reviewFn"
+            >复核</el-button
+          >
+          <el-button type="primary" size="small" @click="detailFn"
+            >详情</el-button
+          >
+        </div>
+      </div>
+      <br />
+
+      <strong>返利互转单列表</strong>
+      <el-divider></el-divider>
+      <!-- 列表 -->
+      <div class="mymain-container">
+        <div class="table">
+          <el-table
+            v-loading="listLoading"
+            :data="dataList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
+            stripe
+          >
+            <el-table-column
+              label="序号"
+              align="center"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="返利转账单号"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="申请日期"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="经销商编号"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="经销商名称"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="表体备注"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="返利类型"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="返利金额"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="备注"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="制单人"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="审核人"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="审核日期"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="复核人"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="复核日期"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="状态"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="操作"
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <template slot-scope="">
+                <el-button type="text" class="textColor" slot="reference"
+                  >审核</el-button
+                >
+                <el-button type="text" class="textColor" slot="reference"
+                  >复核</el-button
+                >
+                <el-button type="text" class="textColor" slot="reference"
+                  >详情</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <!-- 分页 -->
+        <div class="fr">
+          <el-pagination
+            :current-page="currentPage"
+            :page-sizes="[10, 20, 30, 50]"
+            :page-size="10"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="listTotal"
+          >
+          </el-pagination>
+        </div>
+      </div>
+    </div>
+    <ChangeListDetail v-else-if="showPage == 2" />
+    <ChangeListExamine v-else-if="showPage == 3" />
+    <ChangeListReview v-else-if="showPage == 4" />
+  </div>
+</template>
+
+<script>
+import ChangeListDetail from "./components/change_list-detail";
+import ChangeListExamine from "./components/change_list-examine";
+import ChangeListReview from "./components/change_list-review";
+export default {
+  components: {
+    ChangeListDetail,
+    ChangeListExamine,
+    ChangeListReview,
+  },
+  data() {
+    return {
+      category: "全部",
+      showPage: 1,
+    };
+  },
+  methods: {
+    //详情
+    detailFn() {
+      this.showPage = 2;
+    },
+    //复核
+    reviewFn() {
+      this.showPage = 4;
+    },
+    //审核
+    examineFn() {
+      this.showPage = 3;
+    },
+  },
+};
+</script>
+
+<style>
+</style>

src/views/finance/components/account_list-detail.vue

@@ -137,7 +137,7 @@
           ></el-table-column>
           <el-table-column
             align="center"
-            label="首付款金额"
+            label="收付款金额"
             prop=""
             min-width="160"
             show-overflow-tooltip

src/views/finance/components/balance_sum-detail.vue

@@ -4,52 +4,13 @@
       <el-page-header @back="goBack" content="明细"> </el-page-header>
     </div>
     <el-divider></el-divider>
-    <el-form label-width="100px" size="small" label-position="left">
-      <el-row :gutter="20">
-        <el-col :xs="24" :sm="12" :lg="12">
-          <el-radio-group v-model="category" size="">
-            <el-radio-button label="家用空调"></el-radio-button>
-            <el-radio-button label="商用空调"></el-radio-button>
-            <el-radio-button label="生活电器"></el-radio-button>
-          </el-radio-group>
-        </el-col>
-        <el-col :xs="24" :sm="12" :lg="12">
-          <el-form-item label="" class="fr">
-            <el-select class="selectStyle" placeholder="请选择">
-              <el-option> </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
 
-    <h1></h1>
-    <div>
-      <el-row type="flex" class="row-bg" justify="space-around">
-        <el-col :xs="24" :sm="12" :lg="4"
-          ><div class="moneyStyle color1">
-            <span>普通钱包</span>
-            <strong>￥12.367万</strong>
-          </div>
-        </el-col>
-        <el-col :xs="24" :sm="12" :lg="4"
-          ><div class="moneyStyle color2">
-            <span>特殊钱包</span> <strong>￥12.367万</strong>
-          </div></el-col
-        >
-        <el-col :xs="24" :sm="12" :lg="4">
-          <div class="moneyStyle color3">
-            <span>折扣钱包</span> <strong>￥12.367万</strong>
-          </div></el-col
-        >
-        <el-col :xs="24" :sm="12" :lg="4">
-          <div class="moneyStyle color4">
-            <span>返利钱包</span> <strong>￥12.367万</strong>
-          </div></el-col
-        >
-      </el-row>
-    </div>
-    <el-divider></el-divider>
+    <el-radio-group v-model="category" size="">
+      <el-radio-button label="家用空调"></el-radio-button>
+      <el-radio-button label="商用空调"></el-radio-button>
+      <el-radio-button label="生活电器"></el-radio-button>
+    </el-radio-group>
+    <br /><br />
     <el-radio-group v-model="bill" size="">
       <el-radio-button label="贷款台账"></el-radio-button>
       <el-radio-button label="返利台账"></el-radio-button>

src/views/finance/components/change_list-detail.vue

@@ -0,0 +1,136 @@
+<template>
+  <div>
+    <div class="sty">
+      <el-page-header @back="goBack" content="详情"> </el-page-header>
+    </div>
+    <br />
+    <br />
+    <span>返利互转单</span>
+    <el-divider></el-divider>
+    <!-- 筛选条件 -->
+    <div>
+      <el-form
+        ref="searchForm"
+        :model="searchForm"
+        label-width="100px"
+        size="small"
+        label-position="left"
+      >
+        <el-row :gutter="20">
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="返利互转单号" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="单据日期" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="制单人" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="经销商编号" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="经销商名称" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="备注信息" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="审核人" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="审核日期" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="关闭人" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="关闭日期" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- 列表 -->
+    <div class="mymain-container">
+      <div class="table">
+        <el-table
+          v-loading="listLoading"
+          :data="dataList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+        >
+          <el-table-column
+            label="序号"
+            align="center"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="返利类型"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="返利金额"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="备注"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <!-- 按钮 -->
+    <div class="btn-group clearfix">
+      <div class="fl">
+        <el-button type="primary" size="small">确定</el-button>
+        <el-button type="primary" size="small">重置</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  methods: {
+    goBack() {
+      this.$parent.showPage = 1;
+    },
+  },
+};
+</script>
+
+<style>
+</style>

src/views/finance/components/change_list-examine.vue

@@ -0,0 +1,150 @@
+<template>
+  <div>
+    <div class="sty">
+      <el-page-header @back="goBack" content="审核"> </el-page-header>
+    </div>
+    <br />
+    <br />
+    <span>返利互转单</span>
+    <el-divider></el-divider>
+    <!-- 筛选条件 -->
+    <div>
+      <el-form
+        ref="searchForm"
+        :model="searchForm"
+        label-width="100px"
+        size="small"
+        label-position="left"
+      >
+        <el-row :gutter="20">
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="返利互转单号" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="单据日期" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="制单人" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="经销商编号" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="经销商名称" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="备注信息" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="审核人" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="审核日期" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- 列表 -->
+    <div class="mymain-container">
+      <div class="table">
+        <el-table
+          v-loading="listLoading"
+          :data="dataList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+        >
+          <el-table-column
+            label="序号"
+            align="center"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="返利类型"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="返利金额"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="备注"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <div class="diy-table-1">
+      <el-row :gutter="0">
+        <el-col :span="12" class="item">
+          <div class="label">审批人</div>
+          <div class="value">2022123233435342</div>
+        </el-col>
+        <el-col :span="12" class="item">
+          <div class="label">审批结果</div>
+          <div class="value">
+            <el-radio-group>
+              <el-radio :label="true">通过</el-radio>
+              <el-radio :label="false">驳回</el-radio>
+            </el-radio-group>
+          </div>
+        </el-col>
+        <el-col :span="24" class="item">
+          <div class="label">审批说明</div>
+          <div class="value">
+            <el-input placeholder="请输入内容"></el-input>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
+    <br />
+    <!-- 按钮 -->
+    <div class="btn-group clearfix">
+      <div class="fl">
+        <el-button type="primary" size="small">确定</el-button>
+        <el-button type="primary" size="small">重置</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  methods: {
+    goBack() {
+      this.$parent.showPage = 1;
+    },
+  },
+};
+</script>
+
+<style>
+</style>

src/views/finance/components/change_list-review.vue

@@ -0,0 +1,160 @@
+<template>
+  <div>
+    <div class="sty">
+      <el-page-header @back="goBack" content="复核"> </el-page-header>
+    </div>
+    <br />
+    <br />
+    <span>返利互转单</span>
+    <el-divider></el-divider>
+    <!-- 筛选条件 -->
+    <div>
+      <el-form
+        ref="searchForm"
+        :model="searchForm"
+        label-width="100px"
+        size="small"
+        label-position="left"
+      >
+        <el-row :gutter="20">
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="返利互转单号" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="单据日期" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="制单人" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="经销商编号" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="经销商名称" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="备注信息" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="审核人" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="审核日期" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="复核人" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="复核日期" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- 列表 -->
+    <div class="mymain-container">
+      <div class="table">
+        <el-table
+          v-loading="listLoading"
+          :data="dataList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+        >
+          <el-table-column
+            label="序号"
+            align="center"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="返利类型"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="返利金额"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="备注"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <div class="diy-table-1">
+      <el-row :gutter="0">
+        <el-col :span="12" class="item">
+          <div class="label">复核人</div>
+          <div class="value">2022123233435342</div>
+        </el-col>
+        <el-col :span="12" class="item">
+          <div class="label">复核结果</div>
+          <div class="value">
+            <el-radio-group>
+              <el-radio :label="true">通过</el-radio>
+              <el-radio :label="false">驳回</el-radio>
+            </el-radio-group>
+          </div>
+        </el-col>
+        <el-col :span="24" class="item">
+          <div class="label">审批说明</div>
+          <div class="value">
+            <el-input placeholder="请输入内容"></el-input>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
+    <br />
+    <!-- 按钮 -->
+    <div class="btn-group clearfix">
+      <div class="fl">
+        <el-button type="primary" size="small">确定</el-button>
+        <el-button type="primary" size="small">重置</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  methods: {
+    goBack() {
+      this.$parent.showPage = 1;
+    },
+  },
+};
+</script>
+
+<style>
+</style>

src/views/finance/components/credit_list-detail.vue

@@ -41,7 +41,6 @@
     <div class="btn-group clearfix">
       <div class="fr">
         <el-button type="primary" size="small">导出</el-button>
-        <el-button type="primary" size="small">打印</el-button>
       </div>
     </div>
     <!-- 列表 -->

src/views/finance/components/rebate_list-apply.vue

@@ -0,0 +1,285 @@
+<template>
+  <div class="sty">
+    <el-page-header @back="goBack" content="销售返利单"> </el-page-header>
+    <el-divider></el-divider>
+    <!-- 表头 -->
+    <div>
+      <el-form
+        ref="searchForm"
+        :model="searchForm"
+        label-width="100px"
+        size="small"
+        label-position="left"
+      >
+        <el-row :gutter="20">
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="返利单号" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="返利日期" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="备注" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="制单人" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="制单日期" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="审批人" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="审批日期" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="关闭人" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="关闭日期" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- 列表 -->
+    <div class="mymain-container">
+      <div class="table">
+        <el-table
+          v-loading="listLoading"
+          :data="dataList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+        >
+          <el-table-column
+            label="序号"
+            align="center"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="经销商编码"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="经销商名称"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="经销商简称"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="返利类型"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="返利金额"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="暂扣返利"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="备注"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <span>返利单复核及办理折让</span>
+    <el-divider></el-divider>
+    <!-- 列表 -->
+    <div class="mymain-container">
+      <div class="table">
+        <el-table
+          v-loading="listLoading"
+          :data="dataList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+        >
+          <el-table-column
+            align="center"
+            type="selection"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="返利单号"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="经销商编码"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="经销商名称"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="返利类型"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="总返利金额"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="返利金额"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="折让金额"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="暂扣返利"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="折让编号"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="折让账号"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="已办理折让金额"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="折让对应收款单号"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="确认人"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="确认日期"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="复核人"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="复核日期"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <el-button type="primary" size="small">确定</el-button>
+    <el-button type="primary" size="small">重置</el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  methods: {
+    goBack() {
+      this.$parent.showPage = 1;
+    },
+  },
+};
+</script>
+
+<style>
+</style>

src/views/finance/components/rebate_list-detail.vue

@@ -25,6 +25,11 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="备注" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="制单人" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
@@ -35,17 +40,22 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="审核人" prop="">
+            <el-form-item label="审批人" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="审核日期" prop="">
+            <el-form-item label="审批日期" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="备注" prop="">
+            <el-form-item label="关闭人" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="关闭日期" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
@@ -86,21 +96,14 @@
           ></el-table-column>
           <el-table-column
             align="center"
-            label="返利类型"
-            prop=""
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="返利钱包ID"
+            label="经销商简称"
             prop=""
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="返利钱包"
+            label="返利类型"
             prop=""
             min-width="160"
             show-overflow-tooltip
@@ -128,17 +131,31 @@
           ></el-table-column>
         </el-table>
       </div>
-      <!-- 分页 -->
-      <div class="fr">
-        <el-pagination
-          :current-page="currentPage"
-          :page-sizes="[10, 20, 30, 50]"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="listTotal"
-        >
-        </el-pagination>
-      </div>
+    </div>
+    <span>审批记录</span>
+    <el-divider></el-divider>
+    <div class="diy-table-1">
+      <el-row :gutter="0">
+        <el-col :span="12" class="item">
+          <div class="label">审批人</div>
+          <div class="value">2022123233435342</div>
+        </el-col>
+        <el-col :span="12" class="item">
+          <div class="label">审批结果</div>
+          <div class="value">
+            <el-radio-group>
+              <el-radio :label="true">通过</el-radio>
+              <el-radio :label="false">弃审</el-radio>
+            </el-radio-group>
+          </div>
+        </el-col>
+        <el-col :span="24" class="item">
+          <div class="label">审批说明</div>
+          <div class="value">
+            <el-input placeholder="请输入内容"></el-input>
+          </div>
+        </el-col>
+      </el-row>
     </div>
   </div>
 </template>
@@ -157,7 +174,7 @@ export default {
   },
   methods: {
     goBack() {
-      this.$parent.showInfo = true;
+      this.$parent.showPage = 1;
     },
   },
 };

src/views/finance/components/rebate_list-examine.vue

@@ -0,0 +1,175 @@
+<template>
+  <div>
+    <div class="sty">
+      <el-page-header @back="goBack" content="返利单"> </el-page-header>
+    </div>
+    <el-divider></el-divider>
+    <!-- 表头 -->
+    <div>
+      <el-form
+        ref="searchForm"
+        :model="searchForm"
+        label-width="100px"
+        size="small"
+        label-position="left"
+      >
+        <el-row :gutter="20">
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="返利单号" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="返利日期" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="备注" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="制单人" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="制单日期" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="审批人" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="审批日期" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="关闭人" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="关闭日期" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- 列表 -->
+    <div class="mymain-container">
+      <div class="table">
+        <el-table
+          v-loading="listLoading"
+          :data="dataList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+        >
+          <el-table-column
+            label="序号"
+            align="center"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="经销商编码"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="经销商名称"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="经销商简称"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="返利类型"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="返利总金额"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="暂扣返利"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="备注"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <div class="diy-table-1">
+      <el-row :gutter="0">
+        <el-col :span="12" class="item">
+          <div class="label">审批人</div>
+          <div class="value">2022123233435342</div>
+        </el-col>
+        <el-col :span="12" class="item">
+          <div class="label">审批结果</div>
+          <div class="value">
+            <el-radio-group>
+              <el-radio :label="true">通过</el-radio>
+              <el-radio :label="false">弃审</el-radio>
+            </el-radio-group>
+          </div>
+        </el-col>
+        <el-col :span="24" class="item">
+          <div class="label">审批说明</div>
+          <div class="value">
+            <el-input placeholder="请输入内容"></el-input>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
+    <br />
+    <el-button type="primary" size="small">确定</el-button>
+    <el-button type="primary" size="small">重置</el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  methods: {
+    goBack() {
+      this.$parent.showPage = 1;
+    },
+  },
+};
+</script>
+
+<style>
+</style>

src/views/finance/components/rebate_list-review.vue

@@ -0,0 +1,287 @@
+<template>
+  <div>
+    <div class="sty">
+      <el-page-header @back="goBack" content="销售返利单"> </el-page-header>
+    </div>
+    <el-divider></el-divider>
+    <!-- 表头 -->
+    <div>
+      <el-form
+        ref="searchForm"
+        :model="searchForm"
+        label-width="100px"
+        size="small"
+        label-position="left"
+      >
+        <el-row :gutter="20">
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="返利单号" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="返利日期" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="备注" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="制单人" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="制单日期" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="审批人" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="审批日期" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="关闭人" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="关闭日期" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- 列表 -->
+    <div class="mymain-container">
+      <div class="table">
+        <el-table
+          v-loading="listLoading"
+          :data="dataList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+        >
+          <el-table-column
+            label="序号"
+            align="center"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="经销商编码"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="经销商名称"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="经销商简称"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="返利类型"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="返利金额"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="暂扣返利"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="备注"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <span>返利单复核及办理折让</span>
+    <el-divider></el-divider>
+    <!-- 列表 -->
+    <div class="mymain-container">
+      <div class="table">
+        <el-table
+          v-loading="listLoading"
+          :data="dataList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+        >
+          <el-table-column
+            align="center"
+            type="selection"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="返利单号"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="经销商编码"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="经销商名称"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="返利类型"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="总返利金额"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="返利金额"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="折让金额"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="暂扣返利"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="折让编号"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="折让账号"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="已办理折让金额"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="折让对应收款单号"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="确认人"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="确认日期"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="复核人"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="复核日期"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <el-button type="primary" size="small">确定</el-button>
+    <el-button type="primary" size="small">重置</el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  methods: {
+    goBack() {
+      this.$parent.showPage = 1;
+    },
+  },
+};
+</script>
+
+<style>
+</style>

src/views/finance/components/receipt_list-detail.vue

@@ -0,0 +1,200 @@
+<template>
+  <div>
+    <div class="sty">
+      <el-page-header @back="goBack"> </el-page-header>
+      <br />
+      <strong>基本信息</strong>
+      <el-divider></el-divider>
+      <!-- 筛选条件 -->
+      <div>
+        <el-form
+          ref="searchForm"
+          :model="searchForm"
+          label-width="100px"
+          size="small"
+          label-position="left"
+        >
+          <el-row :gutter="20">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="单据类型" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="付款单位类型" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="收款组织" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="单据编号" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="付款单位" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="结算组织" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="币别" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="销售组织" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="业务日期" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="往来单位类型" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="应收金额" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="销售部门" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="销售组" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="往来单位" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="实收金额" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="钱包" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="销售员" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="备注" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <br />
+      <strong>明细</strong>
+      <el-divider></el-divider>
+      <!-- 列表 -->
+      <div class="mymain-container">
+        <div class="table">
+          <el-table
+            v-loading="listLoading"
+            :data="dataList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
+            stripe
+          >
+            <el-table-column
+              align="center"
+              label="序号"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="结算方式"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="收款用途"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="实收金额"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="应收金额"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="现金折扣"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="折后金额"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="我方银行账号"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+          </el-table>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  methods: {
+    goBack() {
+      this.$parent.showDetail = true;
+    },
+  },
+};
+</script>
+
+<style>
+</style>

src/views/finance/components/special_list-detail.vue → src/views/finance/components/receivable_list-add.vue

@@ -1,8 +1,10 @@
 <template>
   <div>
     <div class="sty">
-      <el-page-header @back="goBack" content="特殊费"> </el-page-header>
+      <el-page-header @back="goBack"> </el-page-header>
     </div>
+    <br />
+    <span>基本信息</span>
     <el-divider></el-divider>
     <!-- 表头 -->
     <div>
@@ -15,49 +17,67 @@
       >
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="单据类型" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="往来单位类型" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="结算组织" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="单据来源" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="单据编号" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="单据日期" prop="">
+            <el-form-item label="往来单位" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="经销商" prop="">
-              <el-select class="selectStyle" placeholder="请选择">
-                <el-option> </el-option>
-              </el-select>
+            <el-form-item label="收款组织" prop="">
+              <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="科目" prop="">
+            <el-form-item label="备注" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="币种" prop="">
+            <el-form-item label="业务日期" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="汇率" prop="">
+            <el-form-item label="币别" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="金额" prop="">
+            <el-form-item label="销售组织" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="本币金额" prop="">
+            <el-form-item label="到期日" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="数量" prop="">
+            <el-form-item label="总金额" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
@@ -67,43 +87,45 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="业务员" prop="">
+            <el-form-item label="单据状态" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="项目" prop="">
+            <el-form-item label="申请部门" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="付款条件" prop="">
+            <el-form-item label="组" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="摘要" prop="">
+            <el-form-item label="制单日期" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="厂工程编码" prop="">
+            <el-form-item label="制单人" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="订单类型" prop="">
+            <el-form-item label="钱包" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="单据来源" prop="">
+            <el-form-item label="业务员" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </div>
+    <span>明细</span>
+    <el-divider></el-divider>
     <!-- 列表 -->
     <div class="mymain-container">
       <div class="table">
@@ -115,7 +137,6 @@
           fit
           highlight-current-row
           stripe
-          show-summary
         >
           <el-table-column
             label="序号"
@@ -125,70 +146,56 @@
           ></el-table-column>
           <el-table-column
             align="center"
-            label="方向"
-            prop=""
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="科目"
+            label="*费用项目编码"
             prop=""
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="币种"
+            label="项目费用名称"
             prop=""
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="汇率"
+            label="*费用承担部门"
             prop=""
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="金额"
+            label="*发票类型"
             prop=""
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="本币金额"
+            label="不含税金额"
             prop=""
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="部门"
+            label="税额"
             prop=""
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="业务员"
+            label="总金额"
             prop=""
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="项目"
-            prop=""
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="摘要"
+            label="备注"
             prop=""
             min-width="160"
             show-overflow-tooltip
@@ -196,61 +203,29 @@
         </el-table>
       </div>
     </div>
-    <!-- 表头 -->
-    <div>
-      <el-form
-        ref="searchForm"
-        :model="searchForm"
-        label-width="100px"
-        size="small"
-        label-position="left"
-      >
-        <el-row :gutter="20">
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="录入人" prop="">
-              <el-input placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="录单时间" prop="">
-              <el-input placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="审核人" prop="">
-              <el-input placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="审核时间" prop="">
-              <el-input placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+    <!-- 按钮 -->
+    <div class="btn-group clearfix">
+      <div class="fl">
+        <el-button type="primary" size="small">提交审核</el-button>
+        <el-button type="primary" size="small">重置</el-button>
+      </div>
+      <div class="fr">
+        <el-button type="primary" size="small">添加行</el-button>
+        <el-button type="primary" size="small">删除行</el-button>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
 export default {
-  data() {
-    return {
-      dataList: [], // 列表数据
-      searchForm: {}, //搜索表单
-      listLoading: false, // 列表加载loading
-    };
-  },
   methods: {
     goBack() {
-      this.$parent.isShowType = 1;
+      this.$parent.showPage = 1;
     },
   },
 };
 </script>
 
-<style lang="scss" scoped>
-.selectStyle {
-  width: 100%;
-}
+<style>
 </style>

src/views/finance/components/special_list-add.vue → src/views/finance/components/receivable_list-approval.vue

@@ -1,8 +1,10 @@
 <template>
   <div>
     <div class="sty">
-      <el-page-header @back="goBack" content="开单"> </el-page-header>
+      <el-page-header @back="goBack"> </el-page-header>
     </div>
+    <br />
+    <span>基本信息</span>
     <el-divider></el-divider>
     <!-- 表头 -->
     <div>
@@ -15,51 +17,67 @@
       >
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="单据类型" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="往来单位类型" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="结算组织" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="单据来源" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="单据编号" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="单据日期" prop="">
+            <el-form-item label="往来单位" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="经销商" prop="">
-              <el-select class="selectStyle" placeholder="请选择">
-                <el-option> </el-option>
-              </el-select>
+            <el-form-item label="收款组织" prop="">
+              <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="单据内容" prop="">
+            <el-form-item label="备注" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="币种" prop="">
+            <el-form-item label="业务日期" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="税率" prop="">
-              <el-select class="selectStyle" placeholder="请选择">
-                <el-option> </el-option>
-              </el-select>
+            <el-form-item label="币别" prop="">
+              <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="金额" prop="">
+            <el-form-item label="销售组织" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="本币金额" prop="">
+            <el-form-item label="到期日" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="数量" prop="">
+            <el-form-item label="总金额" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
@@ -69,43 +87,45 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="业务员" prop="">
+            <el-form-item label="单据状态" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="项目" prop="">
+            <el-form-item label="申请部门" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="付款条件" prop="">
+            <el-form-item label="组" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="摘要" prop="">
+            <el-form-item label="制单日期" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="厂工程编码" prop="">
+            <el-form-item label="制单人" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="订单类型" prop="">
+            <el-form-item label="钱包" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="单据来源" prop="">
+            <el-form-item label="业务员" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </div>
+    <span>明细</span>
+    <el-divider></el-divider>
     <!-- 列表 -->
     <div class="mymain-container">
       <div class="table">
@@ -117,7 +137,6 @@
           fit
           highlight-current-row
           stripe
-          show-summary
         >
           <el-table-column
             label="序号"
@@ -127,119 +146,94 @@
           ></el-table-column>
           <el-table-column
             align="center"
-            label="方向"
-            prop="aaa"
-            min-width="160"
-            show-overflow-tooltip
-          >
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.aaa"></el-input>
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            label="科目"
+            label="*费用项目编码"
             prop=""
             min-width="160"
             show-overflow-tooltip
-          >
-            <template slot-scope="">
-              <el-input></el-input>
-            </template>
-          </el-table-column>
+          ></el-table-column>
           <el-table-column
             align="center"
-            label="币种"
+            label="项目费用名称"
             prop=""
             min-width="160"
             show-overflow-tooltip
-          >
-            <template slot-scope="">
-              <el-input></el-input>
-            </template>
-          </el-table-column>
+          ></el-table-column>
           <el-table-column
             align="center"
-            label="汇率"
+            label="*费用承担部门"
             prop=""
             min-width="160"
             show-overflow-tooltip
-          >
-            <template slot-scope="">
-              <el-input></el-input>
-            </template>
-          </el-table-column>
+          ></el-table-column>
           <el-table-column
             align="center"
-            label="金额"
+            label="*发票类型"
             prop=""
             min-width="160"
             show-overflow-tooltip
-          >
-            <template slot-scope="">
-              <el-input></el-input>
-            </template>
-          </el-table-column>
+          ></el-table-column>
           <el-table-column
             align="center"
-            label="本币金额"
+            label="不含税金额"
             prop=""
             min-width="160"
             show-overflow-tooltip
-          >
-            <template slot-scope="">
-              <el-input></el-input>
-            </template>
-          </el-table-column>
+          ></el-table-column>
           <el-table-column
             align="center"
-            label="部门"
+            label="税额"
             prop=""
             min-width="160"
             show-overflow-tooltip
-          >
-            <template slot-scope="">
-              <el-input></el-input>
-            </template>
-          </el-table-column>
+          ></el-table-column>
           <el-table-column
             align="center"
-            label="业务员"
+            label="总金额"
             prop=""
             min-width="160"
             show-overflow-tooltip
-          >
-            <template slot-scope="">
-              <el-input></el-input>
-            </template>
-          </el-table-column>
+          ></el-table-column>
           <el-table-column
             align="center"
-            label="摘要"
+            label="备注"
             prop=""
             min-width="160"
             show-overflow-tooltip
-          >
-            <template slot-scope="">
-              <el-input></el-input>
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            label="操作"
-            min-width="160"
-            show-overflow-tooltip
-          >
-            <el-button type="text" class="textColor">删除</el-button>
-          </el-table-column>
+          ></el-table-column>
         </el-table>
       </div>
     </div>
+
+    <span>审批信息</span>
+    <el-divider></el-divider>
+    <div class="diy-table-1">
+      <el-row :gutter="0">
+        <el-col :span="12" class="item">
+          <div class="label">审批人</div>
+          <div class="value">2022123233435342</div>
+        </el-col>
+        <el-col :span="12" class="item">
+          <div class="label">审批结果</div>
+          <div class="value">
+            <el-radio-group>
+              <el-radio :label="true">通过</el-radio>
+              <el-radio :label="false">驳回</el-radio>
+            </el-radio-group>
+          </div>
+        </el-col>
+        <el-col :span="24" class="item">
+          <div class="label">审批说明</div>
+          <div class="value">
+            <el-input placeholder="请输入内容"></el-input>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
+    <br />
     <!-- 按钮 -->
     <div class="btn-group clearfix">
       <div class="fl">
-        <el-button type="primary" size="small">保存</el-button>
-        <el-button type="primary" size="small">提交审核</el-button>
+        <el-button type="primary" size="small">提交审批</el-button>
         <el-button type="primary" size="small">重置</el-button>
       </div>
     </div>
@@ -248,23 +242,13 @@
 
 <script>
 export default {
-  data() {
-    return {
-      dataList: [{ aaa: "" }], // 列表数据
-      searchForm: {}, //搜索表单
-      listLoading: false, // 列表加载loading
-    };
-  },
   methods: {
     goBack() {
-      this.$parent.isShowType = 1;
+      this.$parent.showPage = 1;
     },
   },
 };
 </script>
 
-<style lang="scss" scoped>
-.selectStyle {
-  width: 100%;
-}
+<style>
 </style>

src/views/finance/components/receivable_list-detail.vue

@@ -0,0 +1,251 @@
+<template>
+  <div>
+    <div class="sty">
+      <el-page-header @back="goBack"> </el-page-header>
+    </div>
+    <br />
+    <span>基本信息</span>
+    <el-divider></el-divider>
+    <!-- 表头 -->
+    <div>
+      <el-form
+        ref="searchForm"
+        :model="searchForm"
+        label-width="100px"
+        size="small"
+        label-position="left"
+      >
+        <el-row :gutter="20">
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="单据类型" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="往来单位类型" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="结算组织" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="单据来源" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="单据编号" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="往来单位" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="收款组织" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="备注" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="业务日期" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="币别" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="销售组织" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="到期日" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="总金额" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="部门" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="单据状态" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="申请部门" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="组" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="制单日期" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="制单人" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="钱包" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="业务员" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <span>明细</span>
+    <el-divider></el-divider>
+    <!-- 列表 -->
+    <div class="mymain-container">
+      <div class="table">
+        <el-table
+          v-loading="listLoading"
+          :data="dataList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+        >
+          <el-table-column
+            label="序号"
+            align="center"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="*费用项目编码"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="项目费用名称"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="*费用承担部门"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="*发票类型"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="不含税金额"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="税额"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="总金额"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="备注"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+        </el-table>
+      </div>
+    </div>
+
+    <span>审批记录</span>
+    <el-divider></el-divider>
+    <div class="diy-table-1">
+      <el-row :gutter="0">
+        <el-col :span="8" class="item">
+          <div class="label">审批人</div>
+          <div class="value">2022123233435342</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">审批结果</div>
+          <div class="value">
+            <el-radio-group>
+              <el-radio :label="true">通过</el-radio>
+              <el-radio :label="false">驳回</el-radio>
+            </el-radio-group>
+          </div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">审批时间</div>
+          <div class="value">2022-09-12012:23</div>
+        </el-col>
+        <el-col :span="24" class="item">
+          <div class="label">审批说明</div>
+          <div class="value">
+            <el-input placeholder="请输入内容"></el-input>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
+    <br />
+  </div>
+</template>
+
+<script>
+export default {
+  methods: {
+    goBack() {
+      this.$parent.showPage = 1;
+    },
+  },
+};
+</script>
+
+<style>
+</style>

src/views/finance/credit_list.vue

@@ -21,15 +21,14 @@
                 <el-input placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="12">
-              <el-form-item label="日期时间" prop="">
-                <el-date-picker
-                  type="datetimerange"
-                  range-separator="至"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                >
-                </el-date-picker>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="关联钱包" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="总信用额度" prop="">
+                <el-input placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
 
@@ -91,7 +90,7 @@
             ></el-table-column>
             <el-table-column
               align="center"
-              label="总信用额度"
+              label="当前信用额度"
               prop=""
               min-width="160"
               show-overflow-tooltip
@@ -115,10 +114,10 @@
               label="操作"
               min-width="160"
               show-overflow-tooltip
-            >    
+            >
               <template slot-scope="">
                 <el-button type="text" class="textColor" slot="reference"
-                  >编辑</el-button
+                  >设置额度</el-button
                 >
                 <el-button type="text" class="textColor" slot="reference"
                   >记录</el-button

src/views/finance/finance_sum.vue

@@ -41,14 +41,21 @@
         >
           <el-table-column
             align="center"
-            label="钱包类型"
+            label="品类"
             prop=""
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="经销商名称"
+            label="钱包名称"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="余额"
             prop=""
             min-width="160"
             show-overflow-tooltip

src/views/finance/rebate_form.vue

@@ -0,0 +1,132 @@
+<template>
+  <div class="app-container">
+    <span>返利单</span>
+    <el-divider></el-divider>
+    <!-- 表头 -->
+    <div>
+      <el-form
+        ref="searchForm"
+        :model="searchForm"
+        label-width="100px"
+        size="small"
+        label-position="left"
+      >
+        <el-row :gutter="20">
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="返利单号" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="返利日期" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="备注" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="制单人" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="制单日期" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- 按钮 -->
+    <div class="btn-group clearfix">
+      <div class="fr">
+        <el-button type="primary" size="small">批量导入</el-button>
+      </div>
+    </div>
+    <!-- 列表 -->
+    <div class="mymain-container">
+      <div class="table">
+        <el-table
+          v-loading="listLoading"
+          :data="dataList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+        >
+          <el-table-column
+            align="center"
+            label="序号"
+            type="index"
+            width="100"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="经销商编码"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="经销商名称"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="经销商简称"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="返利类型"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="返利总金额"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="暂扣返利"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="备注"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <br />
+    <el-button type="primary" size="small">保存</el-button>
+    <el-button type="primary" size="small">提交审批</el-button>
+    <el-button type="primary" size="small">重置</el-button>
+  </div>
+</template>
+
+<script>
+export default {};
+</script>
+
+<style>
+</style>

src/views/finance/rebate_list.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div v-if="showInfo">
+    <div v-if="showPage == 1">
       <!-- 筛选条件 -->
       <div>
         <el-form
@@ -47,15 +47,22 @@
       <!-- 按钮 -->
       <div class="btn-group clearfix">
         <div class="fl">
+          <el-button type="primary" size="small" @click="applyFn"
+            >申请</el-button
+          >
+
+          <el-button type="primary" size="small" @click="examineFn"
+            >审核</el-button
+          >
+
+          <el-button type="primary" size="small" @click="reviewFn"
+            >复核</el-button
+          >
+
           <el-button type="primary" size="small" @click="infoFn"
             >详情</el-button
           >
         </div>
-        <div class="fr">
-          <el-button type="primary" size="small">导入</el-button>
-          <el-button type="primary" size="small">导出</el-button>
-          <el-button type="primary" size="small">打印</el-button>
-        </div>
       </div>
 
       <!-- 列表 -->
@@ -71,12 +78,6 @@
             stripe
           >
             <el-table-column
-              label="序号"
-              align="center"
-              min-width="100"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
               align="center"
               label="返利单号"
               prop=""
@@ -106,6 +107,20 @@
             ></el-table-column>
             <el-table-column
               align="center"
+              label="主表备注"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="总金额"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
               label="返利类型"
               prop=""
               min-width="160"
@@ -127,7 +142,98 @@
             ></el-table-column>
             <el-table-column
               align="center"
-              label="备注"
+              label="折让金额"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="折让编号"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="折让账号"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="已办理折让金额"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="折让对应收款单号"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="制单人"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="制单时间"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="审核人"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="审核时间"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="确认人"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="确认时间"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="复核人"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="复核时间"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="状态"
               prop=""
               min-width="160"
               show-overflow-tooltip
@@ -137,9 +243,19 @@
               label="操作"
               min-width="160"
               show-overflow-tooltip
+              fixed="right"
             >
               <template slot-scope="">
                 <el-button type="text" class="textColor" slot="reference"
+                  >申请</el-button
+                >
+                <el-button type="text" class="textColor" slot="reference"
+                  >审核</el-button
+                >
+                <el-button type="text" class="textColor" slot="reference"
+                  >复核</el-button
+                >
+                <el-button type="text" class="textColor" slot="reference"
                   >详情</el-button
                 >
               </template>
@@ -159,17 +275,25 @@
         </div>
       </div>
     </div>
-
+    <RebateListApply v-else-if="showPage == 2" />
+    <RebateListExamine v-else-if="showPage == 3" />
+    <RebateListReview v-else-if="showPage == 4" />
     <!-- 详情 -->
-    <RebateListDetail v-else />
+    <RebateListDetail v-else-if="showPage == 5" />
   </div>
 </template>
 
 <script>
+import RebateListApply from "./components/rebate_list-apply.vue";
+import RebateListExamine from "./components/rebate_list-examine.vue";
+import RebateListReview from "./components/rebate_list-review.vue";
 import RebateListDetail from "./components/rebate_list-detail";
 export default {
   components: {
     RebateListDetail,
+    RebateListApply,
+    RebateListExamine,
+    RebateListReview,
   },
   data() {
     return {
@@ -179,12 +303,26 @@ export default {
       dataList: [], // 列表数据
       searchForm: {}, //搜索表单
       listLoading: false, // 列表加载loading
-      showInfo: true,
+      showPage: 1,
     };
   },
   methods: {
+    //复核
+    reviewFn() {
+      this.showPage = 4;
+    },
+    //审核
+    examineFn() {
+      this.showPage = 3;
+    },
+    //申请
+    applyFn() {
+      this.showPage = 2;
+    },
+
+    //详情
     infoFn() {
-      this.showInfo = false;
+      this.showPage = 5;
     },
   },
 };

src/views/finance/receipt_list.vue

@@ -0,0 +1,240 @@
+<template>
+  <div class="app-container">
+    <div v-if="showDetail">
+      <!-- 筛选条件 -->
+      <div>
+        <el-form
+          ref="searchForm"
+          :model="searchForm"
+          label-width="100px"
+          size="small"
+          label-position="left"
+        >
+          <el-row :gutter="20">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="单据类型" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="单据编号" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="往来单位" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="付款单位" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="结算方式" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="收款用途" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="业务日期" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="" class="fr">
+                <el-button size="small">清空</el-button>
+                <el-button size="small" type="primary">搜索</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <!-- 按钮 -->
+      <div class="btn-group clearfix">
+        <div class="fr">
+          <el-button type="primary" size="small" @click="seeFn">查看</el-button>
+          <el-button type="primary" size="small">导出</el-button>
+        </div>
+      </div>
+      <!-- 列表 -->
+      <div class="mymain-container">
+        <div class="table">
+          <el-table
+            v-loading="listLoading"
+            :data="dataList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
+            stripe
+          >
+            <el-table-column
+              align="center"
+              label="单据类型"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="单据编码"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="业务日期"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="币别"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="表头·应收金额"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="往来单位"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="表头·实收金额"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="收款金额"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="结算方式"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="收款用途"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="付款单位"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="表体·实收金额"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="勾对"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="单据状态"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="备注"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="操作"
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <template slot-scope="">
+                <el-button type="text" class="textColor" slot="reference"
+                  >查看</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <!-- 分页 -->
+        <div class="fr">
+          <el-pagination
+            :current-page="currentPage"
+            :page-sizes="[10, 20, 30, 50]"
+            :page-size="10"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="listTotal"
+          >
+          </el-pagination>
+        </div>
+      </div>
+    </div>
+    <ReceiptListDetail v-else />
+  </div>
+</template>
+
+<script>
+import ReceiptListDetail from "./components/receipt_list-detail";
+export default {
+  components: {
+    ReceiptListDetail,
+  },
+  data() {
+    return {
+      currentPage: 1, // 当前页码
+      pageSize: 10, // 每页数量
+      listTotal: 0, // 列表总数
+      dataList: [], // 列表数据
+      searchForm: {}, //搜索表单
+      listLoading: false, // 列表加载loading
+      showDetail: true,
+    };
+  },
+  methods: {
+    seeFn() {
+      this.showDetail = false;
+    },
+  },
+};
+</script>
+
+<style>
+</style>

src/views/finance/special_list.vue → src/views/finance/receivable_list.vue

@@ -1,6 +1,13 @@
 <template>
   <div class="app-container">
-    <div v-if="isShowType == 1">
+    <div v-if="showPage == 1">
+      <el-radio-group v-model="examine" size="">
+        <el-radio-button label="全部"></el-radio-button>
+        <el-radio-button label="待审核"></el-radio-button>
+        <el-radio-button label="审核通过"></el-radio-button>
+        <el-radio-button label="审核驳回"></el-radio-button>
+      </el-radio-group>
+      <br /><br />
       <!-- 筛选条件 -->
       <div>
         <el-form
@@ -12,39 +19,34 @@
         >
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商编码" prop="">
-                <el-input placeholder="请输入"></el-input>
+              <el-form-item label="工程押金" prop="">
+                <el-select class="selectStyle" placeholder="请选择">
+                  <el-option> </el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商名称" prop="">
+              <el-form-item label="单据编号" prop="">
                 <el-input placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="订单类型" prop="">
+              <el-form-item label="往来单位" prop="">
                 <el-input placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="单据日期" prop="">
+              <el-form-item label="申请部门" prop="">
                 <el-input placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="单据号" prop="">
+              <el-form-item label="业务日期" prop="">
                 <el-input placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="状态" prop="">
-                <el-select class="selectStyle" placeholder="请选择">
-                  <el-option> </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
 
-            <el-col :xs="24" :sm="24" :lg="12">
+            <el-col :xs="24" :sm="24" :lg="18">
               <el-form-item label="" class="fr">
                 <el-button size="small">清空</el-button>
                 <el-button size="small" type="primary">搜索</el-button>
@@ -53,23 +55,22 @@
           </el-row>
         </el-form>
       </div>
-
       <!-- 按钮 -->
       <div class="btn-group clearfix">
         <div class="fl">
-          <el-button type="primary" size="small" @click="showAddFn"
-            >新建</el-button
+          <el-button type="primary" size="small" @click="addFn">新建</el-button>
+          <el-button type="primary" size="small">删除</el-button>
+          <el-button type="primary" size="small" @click="approvalFn"
+            >审批</el-button
           >
-          <el-button type="primary" size="small" @click="showInfoFn"
+          <el-button type="primary" size="small" @click="detailFn"
             >详情</el-button
           >
         </div>
         <div class="fr">
           <el-button type="primary" size="small">导出</el-button>
-          <el-button type="primary" size="small">打印</el-button>
         </div>
       </div>
-
       <!-- 列表 -->
       <div class="mymain-container">
         <div class="table">
@@ -82,90 +83,84 @@
             highlight-current-row
             stripe
           >
-            <el-table-column
-              label="序号"
-              align="center"
-              min-width="100"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="单据号"
-              prop=""
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
+            <el-table-column align="center" type="selection" width="100">
+            </el-table-column>
             <el-table-column
               align="center"
-              label="单据日期"
+              label="单据类型"
               prop=""
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
-              label="经销商编码"
+              label="单据来源"
               prop=""
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
-              label="经销商名称"
+              label="单据编码"
               prop=""
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
-              label="科目"
+              label="业务日期"
               prop=""
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
-              label="订单类型"
+              label="往来单位类型"
               prop=""
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
-              label="厂工程编码"
+              label="往来单位"
               prop=""
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
-              label="单据来源"
+              label="币别"
               prop=""
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
-              label="金额"
+              label="总金额"
               prop=""
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
-              label="状态"
+              label="单据状态"
               prop=""
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
+
             <el-table-column
               align="center"
               label="操作"
               min-width="160"
               show-overflow-tooltip
+              fixed="right"
             >
               <template slot-scope="">
                 <el-button type="text" class="textColor" slot="reference"
+                  >审批</el-button
+                >
+                <el-button type="text" class="textColor" slot="reference"
                   >详情</el-button
                 >
               </template>
@@ -185,20 +180,21 @@
         </div>
       </div>
     </div>
-    <!-- 新增 -->
-    <SpecialListAdd v-else-if="isShowType == 2" />
-    <!-- 详情 -->
-    <SpecialListDetail v-else-if="isShowType == 3" />
+    <ReceivableListAdd v-else-if="showPage == 2" />
+    <ReceivableListApproval v-else-if="showPage == 3" />
+    <ReceivableListDetail v-else-if="showPage == 4" />
   </div>
 </template>
 
 <script>
-import SpecialListAdd from "./components/special_list-add";
-import SpecialListDetail from "./components/special_list-detail.vue";
+import ReceivableListAdd from "./components/receivable_list-add";
+import ReceivableListApproval from "./components/receivable_list-approval";
+import ReceivableListDetail from "./components/receivable_list-detail";
 export default {
   components: {
-    SpecialListAdd,
-    SpecialListDetail,
+    ReceivableListAdd,
+    ReceivableListApproval,
+    ReceivableListDetail,
   },
   data() {
     return {
@@ -208,20 +204,26 @@ export default {
       dataList: [], // 列表数据
       searchForm: {}, //搜索表单
       listLoading: false, // 列表加载loading
-      isShowType: 1,
+      examine: "全部",
+      showPage: 1,
     };
   },
   methods: {
-    showInfoFn() {
-      this.isShowType = 3;
+    //详情
+    detailFn() {
+      this.showPage = 4;
+    },
+    //审批
+    approvalFn() {
+      this.showPage = 3;
     },
-    showAddFn() {
-      this.isShowType = 2;
+    //新建
+    addFn() {
+      this.showPage = 2;
     },
   },
 };
 </script>
-
 <style lang="scss" scoped>
 .selectStyle {
   width: 100%;

src/views/finance/standbook_list.vue

@@ -0,0 +1,347 @@
+<template>
+  <div class="app-container">
+    <span>台账</span>
+    <el-divider></el-divider>
+    <el-radio-group v-model="category" size="">
+      <el-radio-button label="家用空调"></el-radio-button>
+      <el-radio-button label="商用空调"></el-radio-button>
+      <el-radio-button label="生活电器"></el-radio-button>
+    </el-radio-group>
+    <br /><br />
+    <el-radio-group v-model="bill" size="">
+      <el-radio-button label="贷款台账"></el-radio-button>
+      <el-radio-button label="返利台账"></el-radio-button>
+    </el-radio-group>
+    <h1></h1>
+    <!-- 筛选条件 -->
+    <div>
+      <el-form
+        ref="searchForm"
+        :model="searchForm"
+        label-width="100px"
+        size="small"
+        label-position="left"
+      >
+        <el-row :gutter="20">
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="钱包" prop="">
+              <el-select class="selectStyle" placeholder="请选择">
+                <el-option> </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="单据号" prop="">
+              <el-input placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="日期时间" prop="">
+              <el-date-picker
+                type="datetimerange"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+
+          <el-col :xs="24" :sm="24" :lg="6">
+            <el-form-item label="" class="fr">
+              <el-button size="small">清空</el-button>
+              <el-button size="small" type="primary">搜索</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <div v-show="bill == '贷款台账'">
+      <!-- 列表 -->
+      <div class="mymain-container">
+        <div class="table">
+          <el-table
+            v-loading="listLoading"
+            :data="dataList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
+            stripe
+          >
+            <el-table-column
+              label="序号"
+              align="center"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="单据日期"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="单据类型"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="单据号"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="钱包"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="摘要"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="预付货款"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="订单占款"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="支付货款"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="押金"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="工程保证金"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="其他暂扣款"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="账户余额"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+          </el-table>
+        </div>
+        <!-- 分页 -->
+        <div class="fr">
+          <el-pagination
+            :current-page="currentPage"
+            :page-sizes="[10, 20, 30, 50]"
+            :page-size="10"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="listTotal"
+          >
+          </el-pagination>
+        </div>
+      </div>
+    </div>
+    <div v-show="bill == '返利台账'">
+      <!-- 列表 -->
+      <div class="mymain-container">
+        <div class="table">
+          <el-table
+            v-loading="listLoading"
+            :data="dataList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
+            stripe
+          >
+            <el-table-column
+              label="序号"
+              align="center"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="客户编码"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="客户名称"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="单据日期"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="审核日期"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="单据类型"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="单据号"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="返利品类"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="摘要"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="收入"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="支出"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="暂扣返利"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="结存"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+          </el-table>
+        </div>
+        <!-- 分页 -->
+        <div class="fr">
+          <el-pagination
+            :current-page="currentPage"
+            :page-sizes="[10, 20, 30, 50]"
+            :page-size="10"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="listTotal"
+          >
+          </el-pagination>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      currentPage: 1, // 当前页码
+      pageSize: 10, // 每页数量
+      listTotal: 0, // 列表总数
+      dataList: [], // 列表数据
+      searchForm: {}, //搜索表单
+      listLoading: false, // 列表加载loading
+      category: "家用空调",
+      bill: "贷款台账",
+    };
+  },
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped>
+.moneyStyle {
+  height: 130px;
+  border-radius: 20px;
+  padding: 20px 0 0 20px;
+  color: #fff;
+  span {
+    display: block;
+    font-size: 20px;
+  }
+  strong {
+    margin-top: 16px;
+    display: block;
+    font-size: 36px;
+  }
+}
+.selectStyle {
+  width: 100%;
+}
+.color1 {
+  background-color: #6c83d0;
+}
+.color2 {
+  background-color: #dfc062;
+}
+.color3 {
+  background-color: #dfc062;
+}
+.color4 {
+  background-color: #6bcfd7;
+}
+</style>

src/views/finance/wallet.vue

@@ -1,386 +1,106 @@
-<template>
+<template >
   <div class="app-container">
-    <div v-if="showRebate">
-      <el-radio-group v-model="category" size="">
-        <el-radio-button label="家用空调"></el-radio-button>
-        <el-radio-button label="商用空调"></el-radio-button>
-        <el-radio-button label="生活电器"></el-radio-button>
-      </el-radio-group>
-      <h1></h1>
-      <div>
-        <el-row type="flex" class="row-bg" justify="space-around">
-          <el-col :xs="24" :sm="12" :lg="4"
-            ><div class="moneyStyle color1">
-              <span>普通钱包</span>
-              <strong>￥12.367万</strong>
-            </div>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="4"
-            ><div class="moneyStyle color2">
-              <span>特殊钱包</span> <strong>￥12.367万</strong>
-            </div></el-col
-          >
-          <el-col :xs="24" :sm="12" :lg="4">
-            <div class="moneyStyle color3">
-              <span>折扣钱包</span> <strong>￥12.367万</strong>
-            </div></el-col
-          >
-          <el-col :xs="24" :sm="12" :lg="4">
-            <div @click="rebateFn" class="moneyStyle color4">
-              <span>返利钱包</span> <strong>￥12.367万</strong>
-            </div></el-col
-          >
-        </el-row>
-      </div>
-      <el-divider></el-divider>
-      <el-radio-group v-model="bill" size="">
-        <el-radio-button label="贷款台账"></el-radio-button>
-        <el-radio-button label="返利台账"></el-radio-button>
-      </el-radio-group>
-      <h2></h2>
-      <!-- 筛选条件 -->
-      <div>
-        <el-form
-          ref="searchForm"
-          :model="searchForm"
-          label-width="100px"
-          size="small"
-          label-position="left"
-        >
-          <el-row :gutter="20">
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="钱包" prop="">
-                <el-select class="selectStyle" placeholder="请选择">
-                  <el-option> </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="单据号" prop="">
-                <el-input placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="日期时间" prop="">
-                <el-date-picker
-                  type="datetimerange"
-                  range-separator="至"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="" class="fr">
-                <el-button size="small">清空</el-button>
-                <el-button size="small" type="primary">搜索</el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-
-      <div v-show="bill == '贷款台账'">
-        <!-- 列表 -->
-        <div class="mymain-container">
-          <div class="table">
-            <el-table
-              v-loading="listLoading"
-              :data="dataList"
-              element-loading-text="Loading"
-              border
-              fit
-              highlight-current-row
-              stripe
-            >
-              <el-table-column
-                label="序号"
-                align="center"
-                min-width="100"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                align="center"
-                label="单据日期"
-                prop=""
-                min-width="160"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                align="center"
-                label="单据类型"
-                prop=""
-                min-width="160"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                align="center"
-                label="单据号"
-                prop=""
-                min-width="160"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                align="center"
-                label="钱包"
-                prop=""
-                min-width="160"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                align="center"
-                label="摘要"
-                prop=""
-                min-width="160"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                align="center"
-                label="预付货款"
-                prop=""
-                min-width="160"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                align="center"
-                label="订单占款"
-                prop=""
-                min-width="160"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                align="center"
-                label="支付货款"
-                prop=""
-                min-width="160"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                align="center"
-                label="押金"
-                prop=""
-                min-width="160"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                align="center"
-                label="工程保证金"
-                prop=""
-                min-width="160"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                align="center"
-                label="其他暂扣款"
-                prop=""
-                min-width="160"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                align="center"
-                label="账户余额"
-                prop=""
-                min-width="160"
-                show-overflow-tooltip
-              ></el-table-column>
-            </el-table>
-          </div>
-          <!-- 分页 -->
-          <div class="fr">
-            <el-pagination
-              :current-page="currentPage"
-              :page-sizes="[10, 20, 30, 50]"
-              :page-size="10"
-              layout="total, sizes, prev, pager, next, jumper"
-              :total="listTotal"
-            >
-            </el-pagination>
-          </div>
+    <el-row>
+      <el-col :xs="24" :sm="12" :lg="12">
+        <div class="styl">现金钱包</div>
+      </el-col>
+      <el-col :xs="24" :sm="12" :lg="12">
+        <div class="fr">
+          <el-button size="small" type="primary">一键生成钱包</el-button>
         </div>
+      </el-col>
+    </el-row>
+    <el-divider></el-divider>
+    <!-- 列表 -->
+    <div class="mymain-container">
+      <div class="table">
+        <el-table
+          v-loading="listLoading"
+          :data="dataList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+        >
+          <el-table-column
+            align="center"
+            label="钱包类型"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="钱包"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="余额"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="更新时间"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+        </el-table>
       </div>
-      <div v-show="bill == '返利台账'">
-        <!-- 列表 -->
-        <div class="mymain-container">
-          <div class="table">
-            <el-table
-              v-loading="listLoading"
-              :data="dataList"
-              element-loading-text="Loading"
-              border
-              fit
-              highlight-current-row
-              stripe
-            >
-              <el-table-column
-                label="序号"
-                align="center"
-                min-width="100"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                align="center"
-                label="客户编码"
-                prop=""
-                min-width="160"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                align="center"
-                label="客户名称"
-                prop=""
-                min-width="160"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                align="center"
-                label="单据日期"
-                prop=""
-                min-width="160"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                align="center"
-                label="审核日期"
-                prop=""
-                min-width="160"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                align="center"
-                label="单据类型"
-                prop=""
-                min-width="160"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                align="center"
-                label="单据号"
-                prop=""
-                min-width="160"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                align="center"
-                label="返利品类"
-                prop=""
-                min-width="160"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                align="center"
-                label="摘要"
-                prop=""
-                min-width="160"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                align="center"
-                label="收入"
-                prop=""
-                min-width="160"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                align="center"
-                label="支出"
-                prop=""
-                min-width="160"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                align="center"
-                label="暂扣返利"
-                prop=""
-                min-width="160"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                align="center"
-                label="结存"
-                prop=""
-                min-width="160"
-                show-overflow-tooltip
-              ></el-table-column>
-            </el-table>
-          </div>
-          <!-- 分页 -->
-          <div class="fr">
-            <el-pagination
-              :current-page="currentPage"
-              :page-sizes="[10, 20, 30, 50]"
-              :page-size="10"
-              layout="total, sizes, prev, pager, next, jumper"
-              :total="listTotal"
-            >
-            </el-pagination>
-          </div>
-        </div>
+    </div>
+    <span>返利钱包</span>
+    <el-divider></el-divider>
+    <!-- 列表 -->
+    <div class="mymain-container">
+      <div class="table">
+        <el-table
+          v-loading="listLoading"
+          :data="dataList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+        >
+          <el-table-column
+            align="center"
+            label="返利钱包"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="钱包余额"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="更新时间"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+        </el-table>
       </div>
     </div>
-    <WalletDetail v-else />
   </div>
 </template>
 
 <script>
-import WalletDetail from "./components/wallet-detail.vue";
-export default {
-  components: {
-    WalletDetail,
-  },
-  data() {
-    return {
-      currentPage: 1, // 当前页码
-      pageSize: 10, // 每页数量
-      listTotal: 0, // 列表总数
-      dataList: [], // 列表数据
-      searchForm: {}, //搜索表单
-      showRebate: true,
-      category: "家用空调",
-      bill: "贷款台账",
-    };
-  },
-  methods: {
-    //返利钱包
-    rebateFn() {
-      this.showRebate = false;
-    },
-    goBack() {
-      this.$parent.showDetail = true;
-    },
-  },
-};
+export default {};
 </script>
 
 <style lang="scss" scoped>
-.moneyStyle {
-  height: 130px;
-  border-radius: 20px;
-  padding: 20px 0 0 20px;
-  color: #fff;
-  span {
-    display: block;
-    font-size: 20px;
-  }
-  strong {
-    margin-top: 16px;
-    display: block;
-    font-size: 36px;
-  }
-}
-.selectStyle {
-  width: 100%;
-}
-.color1 {
-  background-color: #6c83d0;
-}
-.color2 {
-  background-color: #dfc062;
-}
-.color3 {
-  background-color: #dfc062;
-}
-.color4 {
-  background-color: #6bcfd7;
+.styl {
+  padding-top: 14px;
 }
 </style>

src/views/sales_policy/components/AddCondition.vue

@@ -1,7 +1,11 @@
 <template>
   <el-container>
     <el-header height="50px" class="header">
+<<<<<<< HEAD
       <el-page-header @back="handleBack" content="详情页面">
+=======
+      <el-page-header @back="$parent.isShow = 2" content="详情页面">
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
       </el-page-header>
     </el-header>
     <div class="line">
@@ -20,12 +24,88 @@
             v-for="(item, index) in conditionBox"
             :key="index"
           >
+<<<<<<< HEAD
             <el-row>
+=======
+            <el-row >
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
               <el-row class="pdt">
                 <el-button
                   type="primary"
                   size="small"
+<<<<<<< HEAD
                   @click="(VisibleModle = true), getMaterialLists(index)"
+=======
+                  @click="
+                    (VisibleModle = true), getMaterialLists(), (arrIndex = index)
+                  "
+                  >添加机型</el-button
+                >
+
+                <el-button type="primary" size="small" @click="handleDeleteRow(), (arrIndex = index)"
+                  >删除机型</el-button
+                >
+              </el-row>
+              <el-row>
+                <el-table style="width: 100%" :data="item" border   @select="hanleSelectAll"
+          @select-all="hanleSelectAll">
+                  <el-table-column type="selection" width="55" align="center">
+                  </el-table-column>
+                  <el-table-column label="货品名称" width="300" align="center"  prop="materialName">
+                    <template slot-scope="scope">{{ scope.row.date }}</template>
+                  </el-table-column>
+                  <el-table-column prop="specification" label="规格型号" align="center">
+                  </el-table-column>
+                </el-table>
+              </el-row>
+            </el-row>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-form label-width="120px" :inline="false" size="small" >
+            <el-row>
+              <el-form-item label="配置比例设置"> </el-form-item>
+            </el-row>
+            <el-col :xs="24" :sm="8" :lg="8">
+              <el-form-item label="限定机型">
+                <el-input v-model="limit" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col
+              :xs="24"
+              :sm="8"
+              :lg="8"
+              v-for="(len, index) in conditionBox"
+            >
+              <el-form-item :label="'配提' + (index + 1) + '比例'">
+                <el-input size="small"  v-model="popArr['line_'+index]"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-form>
+
+
+        </el-row>
+        <el-divider></el-divider>
+      </el-row>
+    </el-main>
+    <el-main v-else>
+      <el-row>
+        <el-row :gutter="50">
+          <el-col
+            :xs="24"
+            :sm="24"
+            :lg="24"
+            class="mgb"
+            v-for="(item, index) in conditionBoxs"
+            :key="index"
+          >
+            <el-row v-for="col in item">
+              <!-- <el-row class="pdt">
+                <el-button
+                  type="primary"
+                  size="small"
+                  @click="VisibleModle = true"
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
                   >添加机型</el-button
                 >
 
@@ -35,7 +115,7 @@
                   @click="handleDeleteRow(index)"
                   >删除机型</el-button
                 >
-              </el-row>
+              </el-row> -->
               <el-row>
                 <el-table
                   style="width: 100%"
@@ -64,7 +144,7 @@
             </el-row>
           </el-col>
         </el-row>
-        <el-row>
+        <el-row v-if="conditionBoxs.length">
           <el-form label-width="120px" :inline="false" size="small">
             <el-row>
               <el-form-item label="配置比例设置"> </el-form-item>
@@ -348,10 +428,16 @@ import {
   getConditionMaterialDetail,
 } from "@/api/supply/sales";
 import TabelTransfer from "./TabelTransfer.vue";
+<<<<<<< HEAD
 import { mapState} from "vuex";
 import AddModel from "./AddModel";
 import Minxin from "@/mixin";
 import { join } from "path";
+=======
+
+import AddModel from "./AddModel";
+import Minxin from "@/mixin";
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
 export default {
   mixins: [Minxin],
   props: {
@@ -382,7 +468,11 @@ export default {
         policyName: "",
         pop: "",
       },
+<<<<<<< HEAD
       limit: "",
+=======
+      limit:'',
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
       VisibleModle: false,
       conditionBox: [[], []],
       conditionBoxs: [],
@@ -398,12 +488,20 @@ export default {
       type: "",
       saleTypeCode: "",
       arrIndex: 0,
+<<<<<<< HEAD
       popArr: {},
+=======
+      popArr:{}
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
     };
   },
   created() {
     this.getCommonApi();
+<<<<<<< HEAD
     console.log(this.$parent.codeId, "codeid");
+=======
+    console.log(this.$parent.codeId,'codeid' );
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
   },
    computed: mapState({
     comCode: (state) => state.sales.code,
@@ -412,6 +510,7 @@ export default {
 
     },
   methods: {
+<<<<<<< HEAD
     getList() {
 
     },
@@ -421,6 +520,9 @@ export default {
       }else{
         this.$parent.isShow =2
       }
+=======
+    getList(){
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
     },
     getCommonApi() {
       if (this.id) {
@@ -451,6 +553,7 @@ export default {
       this.conditionBox.push([{}]);
     },
     handleSubmit() {
+<<<<<<< HEAD
       console.log(this.comCode);
       var tableData = [];
       for (let i = 0; i < this.conditionBox.length; i++) {
@@ -483,10 +586,37 @@ export default {
         this.$parent.isFlag = 1
         this.$emit('handleSubmitCon',this.comCode)
       });
+=======
+      console.log(this.popArr);
+      const params = {
+        id: "",
+        policyConditionMaterials: [
+          {
+            id: "",
+            materialId: "234",
+            materialName: "234",
+            materialNumber: "34",
+            policyConditionId: "23423",
+            policyId: "234",
+            policyMaterialId: "2342",
+            popType: 0,
+            specification: "2342",
+            walletType: "23423",
+          },
+        ],
+        policyId: this.$parent.codeId,
+        policyName: "hah",
+        pop: "1:2",
+      };
+      // addPoliyCondition(params).then((res) => {
+      //   this.$successMsg("添加成功");
+      // });
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
     },
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
+<<<<<<< HEAD
     // 筛选全部数据
     hanleSelectAll(selection, index) {
       this.arrIndex = index;
@@ -509,6 +639,12 @@ export default {
     },
     getMaterialLists(index) {
       this.arrIndex = index;
+=======
+    handleDeleteRow(){
+      console.log(this.arrIndex);
+    },
+    getMaterialLists() {
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
       getMaterialList({
         pageNum: this.currentPage,
         pageSize: this.pageSize,
@@ -516,7 +652,11 @@ export default {
         policyId: this.$parent.codeId,
       }).then((res) => {
         this.conditList = res.data.records;
+<<<<<<< HEAD
         console.log(4545, this.conditList);
+=======
+        console.log(4545,this.conditList);
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
         this.listTotal = res.data.total;
       });
     },
@@ -538,7 +678,11 @@ export default {
     },
     handleAllAdd() {
       this.conditList2 = this.leftData;
+<<<<<<< HEAD
       this.leftData = [];
+=======
+      this.leftData = []
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
     },
     handleAllDelete() {
       this.conditList2 = [];
@@ -564,13 +708,21 @@ export default {
           if (i == this.arrIndex) {
             this.$set(this.conditionBox, i, [
               ...this.conditList2,
+<<<<<<< HEAD
               ...this.conditionBox[i],
+=======
+              ...this.conditionBox[i]
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
             ]);
             console.log(this.conditionBox);
           }
         }
+<<<<<<< HEAD
         this.VisibleModle = false;
         this.conditList2 = [];
+=======
+        this.VisibleModle = false
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
       } else {
         this.$errorMsg("请选择内容");
       }

src/views/sales_policy/components/AddPolicy.vue

@@ -1,7 +1,11 @@
 <template>
   <div>
     <el-header height="50px" class="header">
+<<<<<<< HEAD
       <el-page-header @back="$parent.isShow = 1,$parent.isFlag=''" content="详情页面">
+=======
+      <el-page-header @back="$parent.isShow = 1" content="详情页面">
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
       </el-page-header>
     </el-header>
     <div class="app-container">
@@ -40,12 +44,21 @@
                   size="small"
                   v-model="searchForm.type"
                   placeholder="销售政策类型"
+<<<<<<< HEAD
 
                   class="select_height"
                 >
                   <el-option
                     v-for="(item,index) in typeOptions"
                     :key="index"
+=======
+                  @change="hanleChange"
+                  class="select_height"
+                >
+                  <el-option
+                    v-for="item in typeOptions"
+                    :key="item.value"
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
                     :label="item.label"
                     :value="item.value"
                   >
@@ -57,8 +70,13 @@
               <el-form-item label="支付钱包类型" prop="name">
                 <el-select v-model="value" placeholder="请选择">
                   <el-option
+<<<<<<< HEAD
                     v-for="(item,index) in walletList"
                     :key="index"
+=======
+                    v-for="item in walletList"
+                    :key="item.mainId"
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
                     :label="item.mainName"
                     :value="item.mainId"
                   >
@@ -67,6 +85,19 @@
               </el-form-item>
             </el-col>
 
+<<<<<<< HEAD
+=======
+            <!-- <el-col :xs="24" :ms="12" :lg="12">
+            <el-form-item label="制单日期" prop="name">
+              <el-date-picker
+                v-model="searchForm.name"
+                type="date"
+                placeholder="制单日期"
+              >
+              </el-date-picker> </el-form-item
+          ></el-col> -->
+
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
             <el-col :xs="24" :ms="12" :lg="12">
               <el-form-item label="生效日期" prop="startTime">
                 <el-date-picker
@@ -104,7 +135,12 @@
                   class="avatar-uploader"
                   action="https://jsonplaceholder.typicode.com/posts/"
                   :show-file-list="false"
+<<<<<<< HEAD
 
+=======
+                  :on-success="handleAvatarSuccess"
+                  :before-upload="beforeAvatarUpload"
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
                 >
                   <img v-if="imageUrl" :src="imageUrl" class="avatar" />
                   <i v-else class="el-icon-plus avatar-uploader-icon"></i>
@@ -367,6 +403,7 @@ export default {
         },
       ],
       conditionList: [],
+
     };
   },
     computed: mapState({
@@ -417,6 +454,15 @@ export default {
         saleTypeName: "",
         status: "",
       };
+<<<<<<< HEAD
+=======
+      // 获取销售政策编号
+      getId().then((res) => {
+        console.log(res.data);
+        this.searchForm.code = res.data;
+        this.$parent.codeId = res.data
+      });
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
       // 获取销售类型列表
       getTypeList(params).then((res) => {
         this.typeList = res.data.records;
@@ -442,6 +488,10 @@ export default {
         this.$alert(result.message, "导入成功", {
           confirmButtonText: "确定",
         });
+<<<<<<< HEAD
+=======
+        // this.getList();
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
         this.handletwoList();
       } else {
         this.$alert(result.message, "导入失败", {
@@ -450,10 +500,27 @@ export default {
       }
     },
     getList() {
+<<<<<<< HEAD
     },
     // 获取货品信息
     handletwoList() {
       // this.searchForm.type
+=======
+      const params = {
+        policyId: this.searchForm.code,
+      };
+      // 获取条件政策
+      getConditionList(params).then((res) => {
+        this.conditionList = res.data;
+      });
+    },
+    //获取政策id调取货品信息
+    hanleChange() {
+      // this.handletwoList();
+    },
+    // 获取货品信息
+    handletwoList() {
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
       const paramss = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
@@ -464,8 +531,12 @@ export default {
       getMaterialList(paramss)
         .then((result) => {
           this.dataList = result.data.records;
+<<<<<<< HEAD
            this.listTotal = result.data.total;
 
+=======
+          console.log(result, 9898989);
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
         })
         .catch((err) => {
           console.error(err);
@@ -474,8 +545,25 @@ export default {
     // 提交审核
     handleAddPolicy(policyCustomers) {
       console.log(policyCustomers, "选择的经销商");
+<<<<<<< HEAD
       if (policyCustomers.length) {
       var arr = [];
+=======
+
+      var arr = [
+        {
+          customerId: "",
+          customerName: "",
+          customerNumber: "",
+          id: "",
+          lastOrderTime: "",
+          limitTakeNum: 0,
+          policyId: "",
+          policyTitle: "",
+          remark: "",
+        },
+      ];
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
       policyCustomers.forEach((el) => {
         arr.push({
           customerId: "",
@@ -483,22 +571,42 @@ export default {
           customerNumber: el.number,
           lastOrderTime: "",
           limitTakeNum: 0,
+<<<<<<< HEAD
           policyId: this.comCode,
+=======
+          policyId: this.searchForm.code,
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
           policyTitle: "",
           remark: "",
         });
       });
+<<<<<<< HEAD
+=======
+
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
       const params = {
         adminCompanyId: "",
         code: "",
         customerCount: 0,
+<<<<<<< HEAD
+        examineBy: "",
+        examineRemark: "",
+        examineStatus: "",
+=======
+
         examineBy: "",
         examineRemark: "",
         examineStatus: "",
+
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
         id: "",
         imgSrc: "",
         policyCustomers: arr,
         remark: "",
+<<<<<<< HEAD
+=======
+
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
         status: true,
         title: "",
         type: "",
@@ -521,6 +629,14 @@ export default {
         this.handletwoList();
       });
     },
+    //删除
+    hanleDelete(id) {
+      const params = { policyMaterialId: id };
+      deleteMaterialPolicy(params).then((res) => {
+        this.$successMsg("删除成功");
+        this.handletwoList();
+      });
+    },
   },
   components: {
     Transfer,

src/views/sales_policy/components/Distributor.vue

@@ -287,7 +287,13 @@ export default {
         this.getList();
       });
     },
+<<<<<<< HEAD
 
+=======
+    hanleSelectAll(){
+
+    }
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
   },
   components: {
     Transfer,

src/views/sales_policy/components/Examine.vue

@@ -1,4 +1,5 @@
 <template>
+<<<<<<< HEAD
   <div>
     <el-header height="50px" class="header">
       <el-page-header @back="$parent.isShow = 1,$parent.id=''" content="详情页面">
@@ -6,6 +7,207 @@
     </el-header>
     <div class="app-container">
       <div class="descriptions">
+=======
+  <div class="app-container">
+    <div class="descriptions">
+      <el-row>
+        <el-col :span="4">销售政策编号</el-col>
+        <el-col :span="4">{{ detail.code }}</el-col>
+        <el-col :span="4">销售政策说明</el-col>
+        <el-col :span="4">{{ detail.title }}</el-col>
+        <el-col :span="4">状态</el-col>
+        <el-col :span="4">{{
+          detail.status == 1 ? "已生效" : "未生效"
+        }}</el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="4">销售政策类型</el-col>
+        <el-col :span="4">{{
+          detail.type == "PROVISION" ? "配提" : "限量"
+        }}</el-col>
+        <el-col :span="4">现金钱包</el-col>
+        <el-col :span="4"></el-col>
+        <el-col :span="4"></el-col>
+        <el-col :span="4"></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="4">备注</el-col>
+        <el-col :span="20">{{ detail.remark }}</el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="3">制单人</el-col>
+        <el-col :span="3">{{ detail.createBy }}</el-col>
+        <el-col :span="3">制单日期</el-col>
+        <el-col :span="3">{{ detail.createTime }}</el-col>
+        <el-col :span="3">生效日期</el-col>
+        <el-col :span="3">{{ detail.startTime }}</el-col>
+        <el-col :span="3">失败日期</el-col>
+        <el-col :span="3">{{ detail.endTime }}</el-col>
+      </el-row>
+      <el-row v-if="this.$parent.isShow == 4">
+        <el-col :span="3">审核人</el-col>
+        <el-col :span="3">{{ detail.examineBy }}</el-col>
+        <el-col :span="3">审核日期</el-col>
+        <el-col :span="3">{{ detail.examineTime }}</el-col>
+        <el-col :span="3">关闭人</el-col>
+        <el-col :span="3"></el-col>
+        <el-col :span="3">关闭日期</el-col>
+        <el-col :span="3"></el-col>
+      </el-row>
+    </div>
+    <div class="mymain-container">
+      <el-row>
+        <el-divider></el-divider>
+        <el-row type="flex">
+          <el-col :span="12">
+            <h4 style="display: inline-block; margin-right: 20px">货品信息</h4>
+            <!-- <el-button size="small">查看</el-button> -->
+          </el-col>
+          <el-col :span="12" class="tr">
+              <el-button size="small"   @click="$parent.isShow=6">查看条件</el-button>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+      </el-row>
+      <el-table :data="dataList" border style="width: 100%">
+        <el-table-column label="状态" width="120" align="center">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.examineStatus == 'WAIT'">待审核</el-tag>
+            <el-tag v-else-if="scope.row.examineStatus == 'OK'">通过 </el-tag>
+            <el-tag v-else>失败</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="code"
+          label="销售政策编号"
+          width="120"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="title"
+          label="销售政策说明"
+          width="120"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column prop="address" label="部门" width="300" align="center">
+        </el-table-column>
+        <el-table-column
+          prop="remark"
+          label="表头备注"
+          width="120"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="startTime"
+          label="生效日期"
+          width="120"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="endTime"
+          label="结束日期"
+          width="120"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="examineBy"
+          label="制表人"
+          width="120"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="examineBy"
+          label="制表日期"
+          width="120"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="examineBy"
+          label="审核人"
+          width="120"
+          align="center"
+        >
+        </el-table-column>
+      </el-table>
+      <el-row>
+        <el-divider></el-divider>
+        <el-row type="flex">
+          <el-col :span="12">
+            <h4 style="display: inline-block; margin-right: 20px">条件信息</h4>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+      </el-row>
+      <el-table
+        :data="conditionList"
+        element-loading-text="Loading"
+        border
+        fit
+        highlight-current-row
+        stripe
+      >
+        <el-table-column
+          fixed
+          type="index"
+          label="序号"
+          width="50"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column prop="name" label="限定条件" align="center">
+        </el-table-column>
+        <el-table-column fixed="right" width="150" label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-row>
+        <el-divider></el-divider>
+        <el-row type="flex">
+          <el-col :span="12">
+            <h4 style="display: inline-block; margin-right: 20px">
+              经销商使用范围
+            </h4>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+      </el-row>
+      <el-table
+        v-loading="listLoading"
+        :data="custoList"
+        element-loading-text="Loading"
+        border
+        fit
+        highlight-current-row
+        stripe
+      >
+        <el-table-column
+          fixed
+          type="index"
+          label="序号"
+          width="50"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="customerNumber"
+          label="经销商编码"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column prop="customerName" label="经销商名称" align="center">
+        </el-table-column>
+      </el-table>
+      <!-- <div class="descriptions">
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
         <el-row>
           <el-col :span="4">销售政策编号</el-col>
           <el-col :span="4">{{ detail.code }}</el-col>

src/views/sales_policy/components/Transfer.vue

@@ -139,7 +139,11 @@ export default {
         },
       ],
       value: "",
+<<<<<<< HEAD
       region: "",
+=======
+      region: "0",
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
       keyword: "",
     };
   },
@@ -154,11 +158,18 @@ export default {
         keyword: this.keyword,
         region: this.region,
       };
+<<<<<<< HEAD
 
       // 获取经销商列表
       getCrList(customerParams).then((res) => {
         this.dataL = res.data.records;
         console.log(res,'获取经销商列表');
+=======
+      console.log(555);
+      // 获取经销商列表
+      getCrList(customerParams).then((res) => {
+        this.dataL = res.data.records;
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
         this.listTotal = res.data.total;
       });
     },

src/views/sales_policy/policy_list.vue

@@ -169,6 +169,20 @@
               size="small"
               @click="(isShow = 5), (id = scope.row.id)"
               >编辑</el-button
+<<<<<<< HEAD
+=======
+            > -->
+            <el-button
+              type="text"
+              size="small"
+              @click="(isShow = 4), (id = scope.row.id)"
+              >详情</el-button
+            >
+            <!-- <el-popconfirm
+              style="margin-left: 10px"
+              title="审核？"
+              @onConfirm="hanleExamine(scope.row)"
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
             > -->
             <el-button
               type="text"
@@ -289,8 +303,13 @@
       </el-pagination>
     </div>
   </div>
+<<<<<<< HEAD
   <AddPolicy v-else-if="isShow == 2"  />
   <AddCondition v-else-if="isShow == 3 || isShow==10" :id="id" @handleSubmitCon='handleSubmitCon'/>
+=======
+  <AddPolicy v-else-if="isShow == 2" />
+  <AddCondition v-else-if="isShow == 3 || isShow == 6" :id="id" />
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
   <Examine v-else />
 </template>
 
@@ -317,8 +336,12 @@ export default {
   data() {
     return {
       id: "",
+<<<<<<< HEAD
       code: "",
       codeId: "",
+=======
+      codeId:'',
+>>>>>>> c6c6fe78bafa47aa89fa477db0c80cf2e9254cad
       isShow: 1,
       dataList: [],
       screenForm: {

src/views/supply/retail/components/retail_detail.vue

@@ -2,130 +2,99 @@
   <div class="detail-container">
     <el-page-header @back="goBack" content="详情"></el-page-header>
 
-    <div id="printData">
-      <div class="main-title">
-        <div class="title">工程订单</div>
-      </div>
+    <div class="main-title">
+      <div class="title">提货进度</div>
+    </div>
+    <div class="progress-container">
+      <el-progress :text-inside="true" :stroke-width="26" :percentage="70"></el-progress>
+    </div>
 
-      <div class="diy-table-1">
-        <el-row>
-          <el-col :span="8" class="item">
-            <div class="label">订单号</div>
-            <div class="value">{{detailData.billNo}}</div>
-          </el-col>
-          <el-col :span="8" class="item">
-            <div class="label">订单日期</div>
-            <div class="value">{{detailData.fdate}}</div>
-          </el-col>
-          <el-col :span="8" class="item">
-            <div class="label">单据状态</div>
-            <div class="value">{{detailData.srcStockId}}</div>
-          </el-col>
-          <el-col :span="8" class="item">
-            <div class="label">工程登录单号</div>
-            <div class="value">{{detailData.destStockId}}</div>
-          </el-col>
-          <el-col :span="8" class="item">
-            <div class="label">项目名称</div>
-            <div class="value">{{detailData.approveDate}}</div>
-          </el-col>
-          <el-col :span="8" class="item">
-            <div class="label">单据类型</div>
-            <div class="value">{{detailData.approverId}}</div>
-          </el-col>
-          <el-col :span="8" class="item">
-            <div class="label">经销商编码</div>
-            <div class="value">{{detailData.approverId}}</div>
-          </el-col>
-          <el-col :span="8" class="item">
-            <div class="label">使用单位</div>
-            <div class="value">{{detailData.approverId}}</div>
-          </el-col>
-          <el-col :span="8" class="item">
-            <div class="label">安装地址</div>
-            <div class="value">{{detailData.approverId}}</div>
-          </el-col>
-          <el-col :span="8" class="item">
-            <div class="label">工程编号</div>
-            <div class="value">{{detailData.approverId}}</div>
-          </el-col>
-          <el-col :span="8" class="item">
-            <div class="label">厂工厂编码</div>
-            <div class="value">{{detailData.approverId}}</div>
-          </el-col>
-          <el-col :span="8" class="item">
-            <div class="label">工程登录类型</div>
-            <div class="value">{{detailData.approverId}}</div>
-          </el-col>
-          <el-col :span="8" class="item">
-            <div class="label">文件编号</div>
-            <div class="value">{{detailData.approverId}}</div>
-          </el-col>
-          <el-col :span="8" class="item">
-            <div class="label">制单人</div>
-            <div class="value">{{detailData.approverId}}</div>
-          </el-col>
-          <el-col :span="8" class="item">
-            <div class="label">制单日期</div>
-            <div class="value">{{detailData.approverId}}</div>
-          </el-col>
-          <el-col :span="24" class="item">
-            <div class="label">格力回复</div>
-            <div class="value">{{detailData.approverId}}</div>
-          </el-col>
-          <el-col :span="24" class="item">
-            <div class="label">格力内部备注</div>
-            <div class="value">{{detailData.approverId}}</div>
-          </el-col>
-          <el-col :span="6" class="item">
-            <div class="label">审核人</div>
-            <div class="value">{{detailData.approverId}}</div>
-          </el-col>
-          <el-col :span="6" class="item">
-            <div class="label">审核日期</div>
-            <div class="value">{{detailData.approverId}}</div>
-          </el-col>
-          <el-col :span="6" class="item">
-            <div class="label">关闭人</div>
-            <div class="value">{{detailData.approverId}}</div>
-          </el-col>
-          <el-col :span="6" class="item">
-            <div class="label">关闭日期</div>
-            <div class="value">{{detailData.approverId}}</div>
-          </el-col>
-          <el-col :span="24" class="item">
-            <div class="label">备注</div>
-            <div class="value">{{detailData.approverId}}</div>
-          </el-col>
-        </el-row>
-      </div>
+    <div class="main-title">
+      <div class="title">订单信息</div>
+    </div>
 
-      <div class="main-title">
-        <div class="title">货品信息</div>
-      </div>
+    <div class="diy-table-1">
+      <el-row>
+        <el-col :span="8" class="item">
+          <div class="label">订单号</div>
+          <div class="value">{{detailData.id}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">订单日期</div>
+          <div class="value">{{detailData.theTime}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">单据状态</div>
+          <div class="value">{{detailData.examineStatus | statusFilter}}</div>
+        </el-col>
+        <el-col :span="16" class="item">
+          <div class="label">备注</div>
+          <div class="value">{{detailData.remark}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">业务员</div>
+          <div class="value">{{detailData.serviceName}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">制单人</div>
+          <div class="value">{{detailData.createName}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">制单日期</div>
+          <div class="value">{{detailData.createTime}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">审核人</div>
+          <div class="value">{{detailData.examineName}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">审核日期</div>
+          <div class="value">{{detailData.examineTime}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">关闭人</div>
+          <div class="value">{{detailData.closeName}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">关闭日期</div>
+          <div class="value">{{detailData.closeTime}}</div>
+        </el-col>
+      </el-row>
+    </div>
 
-      <div class="table" style="margin-top: 20px">
-        <el-table :data="detailData.kingDeeTransferItems" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400">
-          <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
-          <el-table-column align="center" label="引用记录" prop="materialNumber" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="销售类型" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="产品编码" prop="model" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="产品名称" prop="baseUnitId" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="规格型号" prop="qty" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="单位" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="总数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="是否使用返利" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="返利使用比例" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="是否直调" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="直调数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="已发货数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="单价" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="金额" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="返利" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="备注" prop="qty" min-width="160" show-overflow-tooltip></el-table-column>
-        </el-table>
-      </div>
+    <div class="main-title">
+      <div class="title">货品信息</div>
+    </div>
+
+    <div class="table" style="margin-top: 20px">
+      <el-table :data="detailData.retailOrderItemList" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400">
+        <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
+        <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="产品编码" prop="materialCode" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="订单金额" prop="totalAmount" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="返利类型" prop="walletRebateName" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="返利金额" prop="rebateAmount" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="格力折扣" prop="deductAmount" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="现金钱包" prop="walletRebateName2" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="实付金额" prop="payAmount" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="是否直调" prop="isDirectTransfer" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{scope.row.isDirectTransfer ? '是':'否'}}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="原订单数量" prop="oldQty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="税率" prop="tax" min-width="100" show-overflow-tooltip></el-table-column>
+      </el-table>
+    </div>
 
+    <div v-if="isExamine">
       <div class="main-title">
         <div class="title">审批记录</div>
       </div>
@@ -133,34 +102,28 @@
         <el-row :gutter="0">
           <el-col :span="12" class="item">
             <div class="label">审批人</div>
-            <div class="value">2022123233435342</div>
+            <div class="value">{{detailData.examineName}}</div>
           </el-col>
           <el-col :span="12" class="item">
             <div class="label">审批结果</div>
-            <div class="value">2022123233435342</div>
+            <div class="value">{{detailData.examineStatus | statusFilter}}</div>
           </el-col>
           <el-col :span="24" class="item">
             <div class="label">审批说明</div>
-            <div class="value">2022123233435342</div>
+            <div class="value">{{detailData.examineRemark}}</div>
           </el-col>
         </el-row>
       </div>
-      
     </div>
     
     <div class="page-footer">
       <div class="footer" :class="classObj">
-        <el-button  type="primary" @click="openDeliverDialog">直调发货</el-button>
-        <el-popconfirm title="确定关闭吗？" @onConfirm="goBack" style="margin-left: 10px;">
-          <el-button slot="reference">关 闭</el-button>
-        </el-popconfirm>
+        <el-button type="primary" @click="openDeliverDialog">直调发货</el-button>
+        <el-button @click="goBack">关 闭</el-button>
       </div>
     </div>
 
-    <el-dialog
-      title="直调发货"
-      :visible.sync="isShowDeliverDialog"
-      width="80%">
+    <el-dialog title="直调发货" :visible.sync="isShowDeliverDialog" width="80%">
       <el-form ref="deliverForm" :model="deliverForm" label-width="70px" size="small" label-position="left">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="8" :lg="8">
@@ -195,24 +158,30 @@
       </el-form>
 
       <div class="table" style="margin-top: 20px">
-        <el-table :data="detailData.kingDeeTransferItems" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400">
+        <el-table :data="detailData.retailOrderItemList" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400">
           <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
-          <el-table-column align="center" label="引用记录" prop="materialNumber" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="销售类型" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="产品编码" prop="model" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="产品名称" prop="baseUnitId" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="规格型号" prop="qty" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="单位" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="总数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="是否使用返利" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="返利使用比例" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="是否直调" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="直调数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="已发货数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="单价" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="金额" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="返利" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="备注" prop="qty" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="产品编码" prop="materialCode" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="订单金额" prop="totalAmount" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="返利类型" prop="walletRebateName" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="返利金额" prop="rebateAmount" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="格力折扣" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="现金钱包" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="实付金额" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="是否直调" prop="isDirectTransfer" min-width="100" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.isDirectTransfer ? '是':'否'}}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="原订单数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="税率" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
         </el-table>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -225,21 +194,26 @@
 </template>
 
 <script>
-import print from 'vue-print-nb'
-import { getDetail } from "@/api/supply/engin";
+import { getDetail } from "@/api/supply/retail";
 
 export default {
   name: 'RetailDetail',
   componentName: 'RetailDetail',
   props: ['listItem'],
-  directives: {
-    print
+  filters: {
+    statusFilter(val) {
+      const statusList = [
+        { label: '已保存', value: 'SAVE' },
+        { label: '待审核', value: 'WAIT' },
+        { label: '审核通过', value: 'OK' },
+        { label: '审核驳回', value: 'FAIL' },
+      ];
+      let obj = statusList.find(o => o.value == val);
+      return obj ? obj.label : ''
+    }
   },
   data() {
     return {
-      printObj: {
-        id: 'printData'
-      },
       detailData: {},
 
       isShowDeliverDialog: false,
@@ -261,6 +235,9 @@ export default {
         openSidebar: this.sidebar.opened
       }
     },
+    isExamine() {
+      return this.detailData.examineStatus === 'OK' || this.detailData.examineStatus === 'FAIL'
+    }
   },
 
   created() {
@@ -318,4 +295,10 @@ export default {
       padding-left: 10px;
     }
   }
+  .progress-container {
+    display: flex;
+    .el-progress {
+      width: 500px;
+    }
+  }
 </style>

src/views/supply/retail/components/retail_examine.vue

@@ -3,98 +3,42 @@
     <el-page-header @back="goBack" content="审批"></el-page-header>
 
     <div class="main-title">
-      <div class="title">工程订单</div>
+      <div class="title">订单信息</div>
     </div>
 
     <div class="diy-table-1">
       <el-row>
         <el-col :span="8" class="item">
           <div class="label">订单号</div>
-          <div class="value">{{detailData.billNo}}</div>
+          <div class="value">{{detailData.id}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">订单日期</div>
-          <div class="value">{{detailData.fdate}}</div>
+          <div class="value">{{detailData.theTime}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">单据状态</div>
-          <div class="value">{{detailData.srcStockId}}</div>
+          <div class="value">{{detailData.examineStatus | statusFilter}}</div>
         </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">工程登录单号</div>
-          <div class="value">{{detailData.destStockId}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">项目名称</div>
-          <div class="value">{{detailData.approveDate}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">单据类型</div>
-          <div class="value">{{detailData.approverId}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">经销商编码</div>
-          <div class="value">{{detailData.approverId}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">使用单位</div>
-          <div class="value">{{detailData.approverId}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">安装地址</div>
-          <div class="value">{{detailData.approverId}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">工程编号</div>
-          <div class="value">{{detailData.approverId}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">厂工厂编码</div>
-          <div class="value">{{detailData.approverId}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">工程登录类型</div>
-          <div class="value">{{detailData.approverId}}</div>
+        <el-col :span="16" class="item">
+          <div class="label">备注</div>
+          <div class="value">{{detailData.remark}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">文件编号</div>
-          <div class="value">{{detailData.approverId}}</div>
+          <div class="label">业务员</div>
+          <div class="value">{{detailData.serviceName}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">制单人</div>
-          <div class="value">{{detailData.approverId}}</div>
+          <div class="value">{{detailData.createName}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">制单日期</div>
-          <div class="value">{{detailData.approverId}}</div>
-        </el-col>
-        <el-col :span="24" class="item">
-          <div class="label">格力回复</div>
-          <div class="value"><el-input v-model="detailData.remark" placeholder="请输入内容"></el-input></div>
-        </el-col>
-        <el-col :span="24" class="item">
-          <div class="label">格力内部备注</div>
-          <div class="value"><el-input v-model="detailData.remark" placeholder="请输入内容"></el-input></div>
-        </el-col>
-        <el-col :span="6" class="item">
           <div class="label">审核人</div>
-          <div class="value">{{detailData.approverId}}</div>
-        </el-col>
-        <el-col :span="6" class="item">
-          <div class="label">审核日期</div>
-          <div class="value">{{detailData.approverId}}</div>
+          <div class="value">{{detailData.examineName}}</div>
         </el-col>
-        <el-col :span="6" class="item">
+        <el-col :span="8" class="item">
           <div class="label">关闭人</div>
-          <div class="value">{{detailData.approverId}}</div>
-        </el-col>
-        <el-col :span="6" class="item">
-          <div class="label">关闭日期</div>
-          <div class="value">{{detailData.approverId}}</div>
-        </el-col>
-        <el-col :span="24" class="item">
-          <div class="label">备注</div>
-          <div class="value">{{detailData.approverId}}</div>
+          <div class="value">{{detailData.closeName}}</div>
         </el-col>
       </el-row>
     </div>
@@ -104,40 +48,46 @@
     </div>
 
     <div class="table" style="margin-top: 20px">
-      <el-table :data="detailData.kingDeeTransferItems" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400">
+      <el-table :data="detailData.retailOrderItemList" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400">
         <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
-        <el-table-column align="center" label="引用记录" prop="materialNumber" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="销售类型" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="产品编码" prop="model" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="产品名称" prop="baseUnitId" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="规格型号" prop="qty" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="单位" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="总数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="是否使用返利" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="返利使用比例" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="是否直调" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="直调数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="已发货数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="单价" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="金额" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="返利" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="备注" prop="qty" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="产品编码" prop="materialCode" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="订单金额" prop="totalAmount" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="返利类型" prop="walletRebateName" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="返利金额" prop="rebateAmount" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="格力折扣" prop="deductAmount" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="现金钱包" prop="walletRebateName2" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="实付金额" prop="payAmount" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="是否直调" prop="isDirectTransfer" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{scope.row.isDirectTransfer ? '是':'否'}}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="原订单数量" prop="oldQty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="税率" prop="tax" min-width="100" show-overflow-tooltip></el-table-column>
       </el-table>
     </div>
 
     <div class="main-title">
       <div class="title">审批信息</div>
-    </div>
+    </div> 
     <div class="diy-table-1">
       <el-row :gutter="0">
         <el-col :span="12" class="item">
           <div class="label">审批人</div>
-          <div class="value">2022123233435342</div>
+          <div class="value">{{detailData.examineName}}</div>
         </el-col>
         <el-col :span="12" class="item">
           <div class="label">审批结果</div>
           <div class="value">
-            <el-radio-group v-model="examineForm.status">
+            <el-radio-group v-model="mainForm.status">
               <el-radio :label="true">通过</el-radio>
               <el-radio :label="false">驳回</el-radio>
             </el-radio-group>
@@ -145,7 +95,7 @@
         </el-col>
         <el-col :span="24" class="item">
           <div class="label">审批说明</div>
-          <div class="value"><el-input v-model="examineForm.remark" placeholder="请输入内容"></el-input></div>
+          <div class="value"><el-input v-model="mainForm.remark" placeholder="请输入内容"></el-input></div>
         </el-col>
       </el-row>
     </div>
@@ -153,13 +103,7 @@
     <div class="page-footer">
       <div class="footer" :class="classObj">
         <el-button type="primary" @click="clickSubmitForm" :loading="formLoading">{{ formLoading ? '提交中 ...' : '提 交' }}</el-button>
-        <el-popconfirm
-          title="确定关闭吗？"
-          @onConfirm="goBack"
-          style="margin-left: 10px;"
-        >
-          <el-button slot="reference">关 闭</el-button>
-        </el-popconfirm>
+        <el-button @click="goBack">关 闭</el-button>
       </div>
     </div>
 
@@ -167,21 +111,30 @@
 </template>
 
 <script>
-import { getDetail } from "@/api/supply/engin";
+import { getDetail, examineData } from "@/api/supply/retail";
 
 export default {
   name: 'RetailExamine',
   componentName: 'RetailExamine',
   props: ['listItem'],
+  filters: {
+    statusFilter(val) {
+      const statusList = [
+        { label: '已保存', value: 'SAVE' },
+        { label: '待审核', value: 'WAIT' },
+        { label: '审核通过', value: 'OK' },
+        { label: '审核驳回', value: 'FAIL' },
+      ];
+      let obj = statusList.find(o => o.value == val);
+      return obj ? obj.label : ''
+    }
+  },
   data() {
     return {
-      printObj: {
-        id: 'printData'
-      },
       detailData: {},
 
       formLoading: false,
-      examineForm: {
+      mainForm: {
         status: true,
         remark: '',
       }
@@ -217,8 +170,20 @@ export default {
       })
     },
 
+    // 提交审批
     clickSubmitForm() {
-
+      this.formLoading = true;
+      examineData({
+        id: this.listItem.id,
+        examineStatus: this.mainForm.status ? 'OK' : 'FAIL',
+        examineRemark: this.mainForm.remark,
+      }).then(res => {
+        this.$successMsg('审批成功');
+        this.goBack();
+        this.$parent.getList();
+      }).finally(res => {
+        this.formLoading = false;
+      })
     },
 
   }

src/views/supply/retail/components/retail_form.vue

@@ -3,14 +3,14 @@
     <el-page-header @back="goBack" :content="listItem ? '编辑':'新增'"></el-page-header>
 
     <div class="main-title">
-      <div class="title">工程订单</div>
+      <div class="title">订单信息</div>
     </div>
 
-    <el-form ref="mainForm" :model="mainForm" label-width="100px" size="small" label-position="left">
+    <el-form ref="mainForm" :model="mainForm" :rules="mainFormRules" label-width="80px" size="small" label-position="right">
       <el-row :gutter="20">
-        <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="工程订单" prop="warehouse">
-            <el-input v-model="mainForm.remark" placeholder="请输入工程订单"></el-input>
+        <el-col :xs="24" :sm="12" :lg="8" v-if="listItem">
+          <el-form-item label="订单号" prop="id">
+            <el-input v-model="listItem.id" readonly></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8" style="height: 51px;">
@@ -25,136 +25,233 @@
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="品类" prop="warehouse">
-            <el-input v-model="mainForm.remark" placeholder="请输入品类"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="工程登录单号" prop="warehouse">
-            <el-input v-model="mainForm.remark" placeholder="请输入工程登录单号"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="项目名称" prop="warehouse">
-            <el-input v-model="mainForm.remark" placeholder="请输入项目名称"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="单据类型" prop="warehouse">
-            <el-input v-model="mainForm.remark" placeholder="请输入单据类型"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="经销商编码" prop="warehouse">
-            <el-input v-model="mainForm.remark" placeholder="请输入经销商编码"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="使用单位" prop="warehouse">
-            <el-input v-model="mainForm.remark" placeholder="请输入使用单位"></el-input>
+          <el-form-item label="产品大类" prop="type">
+            <el-select v-model="mainForm.type" placeholder="选择产品大类" style="width: 100%">
+              <el-option v-for="item in typeList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
+            </el-select>
           </el-form-item>
         </el-col>
-        <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="安装地址" prop="warehouse">
-            <el-input v-model="mainForm.remark" placeholder="请输入安装地址"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="工程编号" prop="warehouse">
-            <el-input v-model="mainForm.remark" placeholder="请输入工程编号"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="厂工程编码" prop="warehouse">
-            <el-input v-model="mainForm.remark" placeholder="请输入厂工程编码"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="工程登录类型" prop="warehouse">
-            <el-input v-model="mainForm.remark" placeholder="请输入工程登录类型"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :xs="24" :sm="24" :lg="24">
-          <el-form-item label="格力回复" prop="warehouse">
-            <el-input v-model="mainForm.remark" placeholder="请输入格力回复"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :xs="24" :sm="24" :lg="24">
-          <el-form-item label="格力内部备注" prop="warehouse">
-            <el-input v-model="mainForm.remark" placeholder="请输入格力内部备注"></el-input>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :xs="24" :sm="12" :lg="8" v-if="listItem">
+          <el-form-item label="业务员" prop="serviceName">
+            <el-input v-model="listItem.serviceName" readonly></el-input>
           </el-form-item>
         </el-col>
-        <el-col :xs="24" :sm="24" :lg="24">
-          <el-form-item label="备注" prop="warehouse">
+        <el-col :xs="24" :sm="16" :lg="16">
+          <el-form-item label="备注" prop="remark">
             <el-input v-model="mainForm.remark" placeholder="请输入备注"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="制单人" prop="warehouse">
-            <el-input v-model="mainForm.remark" placeholder="请输入制单人"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :xs="24" :sm="12" :lg="8" style="height: 51px;">
-          <el-form-item label="制单日期" prop="date">
-            <el-date-picker
-              v-model="mainForm.date"
-              type="date"
-              value-format="yyyy-MM-dd"
-              style="width: 100%;"
-              placeholder="选择日期">
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
-        <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="文件编号" prop="warehouse">
-            <el-input v-model="mainForm.remark" placeholder="请输入文件编号"></el-input>
-          </el-form-item>
-        </el-col>
       </el-row>
     </el-form>
 
     <div class="main-title">
       <div class="title">货品信息</div>
-      <el-button type="primary" size="small" icon="el-icon-plus">添加货品</el-button>
+      <div v-if="!listItem">
+        <el-select v-model="warehouseValue" placeholder="请选择发货仓库" size="small" style="margin-right: 10px">
+          <el-option :label="item.name" :value="item.id" v-for="(item, index) in warehouseList" :key="index"></el-option>
+        </el-select>
+        <el-button type="primary" size="small" icon="el-icon-search" @click="checkStock">检查库存</el-button>
+        <el-divider direction="vertical"></el-divider>
+        <el-button type="primary" size="small" icon="el-icon-plus" @click="openDialog">添加货品</el-button>
+      </div>
     </div>
 
     <div class="table" style="margin-top: 20px">
-      <el-table :data="detailData.kingDeeTransferItems" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400">
+      <el-table :data="goodsList" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400">
         <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
-        <el-table-column align="center" label="引用记录" prop="materialNumber" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="销售类型" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="产品编码" prop="model" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="产品名称" prop="baseUnitId" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="规格型号" prop="qty" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="单位" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="总数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="是否使用返利" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="返利使用比例" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="是否直调" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="直调数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="已发货数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="单价" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="金额" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="返利" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="备注" prop="qty" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="产品编码" prop="materialCode" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="数量" prop="qty" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.qty" size="small"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="订单金额" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{scope.row.price * scope.row.qty}}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="返利钱包" prop="walletRebateId" min-width="160" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.walletRebateId" placeholder="选择返利钱包" size="small" @change="changeWallet(scope.$index)">
+              <el-option label="不使用" value=""></el-option>
+              <el-option
+                v-for="item in flWalletList"
+                :key="item.customerWalletId"
+                :label="item.name"
+                :value="item.customerWalletId">
+              </el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="返利金额" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{scope.row.price * scope.row.qty * scope.row.rebateRate}}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="格力折扣" min-width="100" show-overflow-tooltip>
+          {{scope.row.qty * scope.row.discAmount}}
+        </el-table-column>
+        <el-table-column align="center" label="现金钱包" prop="walletRebateId2" min-width="160" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.walletRebateId2" placeholder="选择现金钱包" size="small">
+              <el-option label="不使用" value=""></el-option>
+              <el-option
+                v-for="item in xjWalletList"
+                :key="item.customerWalletId"
+                :label="item.name"
+                :value="item.customerWalletId">
+              </el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="实付金额" prop="qty" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{(scope.row.price * scope.row.qty) - (scope.row.price * scope.row.qty * scope.row.rebateRate) - (scope.row.qty * scope.row.discAmount)}}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="是否直调" prop="isDirectTransfer" min-width="100">
+          <template slot-scope="scope">
+            <el-checkbox v-model="scope.row.isDirectTransfer"></el-checkbox>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="直调数量" prop="directTransferQty" min-width="100">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.directTransferQty" size="small"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="备注" prop="remark" min-width="160">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.remark" size="small"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="税率" prop="tax" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="总仓库" prop="status1" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="仓库状态" prop="status2" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="操作" width="100" fixed="right">
+          <template slot-scope="scope">
+            <el-button type="text" @click="deleteItem(scope.$index)">删除</el-button>
+          </template>
+        </el-table-column>
       </el-table>
     </div>
     
     <div class="page-footer">
       <div class="footer" :class="classObj">
         <el-button type="primary" @click="clickSubmitForm">保 存</el-button>
-        <el-button type="primary" @click="clickSubmitForm">提交审核</el-button>
         <el-popconfirm title="确定关闭吗？" @onConfirm="goBack" style="margin-left: 10px;">
           <el-button slot="reference">关 闭</el-button>
         </el-popconfirm>
       </div>
     </div>
 
+    <el-dialog title="添加产品" :visible.sync="isShowDialog" width="80%">
+      <el-form ref="screenForm" :model="screenForm" size="small" label-position="left">
+        <el-row :gutter="20">
+          <el-col :xs="12" :sm="6" :lg="6">
+            <el-form-item prop="type">
+              <el-select v-model="screenForm.type" placeholder="选择品类" style="width: 100%">
+                <el-option v-for="item in typeList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="12" :sm="6" :lg="6">
+            <el-form-item prop="salesType">
+              <el-select v-model="screenForm.salesType" placeholder="选择销售类型" style="width: 100%">
+                <el-option v-for="item in salesTypeList" :key="item.id" :label="item.saleName" :value="item.id"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="12" :sm="6" :lg="6">
+            <el-form-item prop="proNum">
+              <el-input v-model="screenForm.proNum" placeholder="请输入产品编码"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="12" :sm="6" :lg="6">
+            <el-form-item prop="proName">
+              <el-input v-model="screenForm.proName" placeholder="请输入产品名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="12" :sm="6" :lg="6">
+            <el-form-item prop="proModel">
+              <el-input v-model="screenForm.proModel" placeholder="请输入产品型号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="12" :sm="6" :lg="6">
+            <el-form-item prop="price1"  style="display: flex">
+              <el-input v-model="screenForm.price1" placeholder="请输入价格" style="width: 46%"></el-input>
+              <span> - </span>
+              <el-input v-model="screenForm.price2" placeholder="请输入价格" style="width: 46%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="12" :sm="12" :lg="12" class="tr">
+            <el-form-item label="">
+              <el-button size="small" @click="resetScreenForm">清空</el-button>
+              <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div class="tables">
+        <div class="table">
+          <el-table :data="leftGoodsList" element-loading-text="Loading" border fit highlight-current-row stripe height="400" @selection-change="leftSelectionChange">
+            <el-table-column align="center" type="selection" width="55" :selectable='checkboxSelect'></el-table-column>
+            <el-table-column align="center" label="产品编码" prop="number" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="产品名称" prop="name" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="产品型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="产品价格" prop="batchPrice" min-width="80" show-overflow-tooltip></el-table-column>
+          </el-table>
+          <div class="pagination clearfix" style="margin-top: 10px">
+            <div class="fr">
+              <el-pagination
+                @current-change="handleTableCurrentChange"
+                :current-page="currentPage"
+                :page-size="10"
+                background
+                layout="prev, pager, next"
+                :total="listTotal">
+              </el-pagination>
+            </div>
+          </div>
+        </div>
+        <div class="buttons">
+          <el-button size="small" type="primary" @click="addAllGoods">全部添加</el-button>
+          <el-button size="small" type="primary" @click="addGoods">添&emsp;加</el-button>
+          <el-button size="small" type="danger" @click="deleteGoods">删&emsp;除</el-button>
+          <el-button size="small" type="danger" @click="deleteAllGoods">全部删除</el-button>
+        </div>
+        <div class="table">
+          <el-table :data="rightGoodsList" element-loading-text="Loading" border fit highlight-current-row stripe height="400" @selection-change="rightSelectionChange">
+            <el-table-column align="center" type="selection" width="55"></el-table-column>
+            <el-table-column align="center" label="产品编码" prop="number" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="产品名称" prop="name" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="产品型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="产品价格" prop="batchPrice" min-width="80" show-overflow-tooltip></el-table-column>
+          </el-table>
+        </div>
+      </div>
+
+      
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="closeDialog">取 消</el-button>
+        <el-button type="primary" @click="submitAddGoods">确 定</el-button>
+      </span>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
-import { getDetail } from "@/api/supply/engin";
+import { getDetail, addData, editData, getSalesTypeList, getGoodsList, getWalletList, getWarehouseList, checkStock } from "@/api/supply/retail";
+import { getDictList } from '@/api/common'
+import { findElem } from '@/utils/util'
 
 export default {
   name: 'RetailForm',
@@ -162,10 +259,46 @@ export default {
   props: ['listItem'],
   data() {
     return {
-      detailData: {},
       mainForm: {
+        date: '',
+        type: '',
+        remark: '',
+      },
+      mainFormRules: {
+        date: [
+          { required: true, message: '请选择单据日期', trigger: 'change' }
+        ],
+        type: [
+          { required: true, message: '请选择品类', trigger: 'change' }
+        ],
+      },
+      goodsList: [],
 
+      warehouseList: [],
+      warehouseValue: '',
+      isShowDialog: false,
+      screenForm: {
+        type: '',
+        salesType: '',
+        proNum: '',
+        proName: '',
+        proModel: '',
+        price1: '',
+        price2: '',
       },
+      currentPage: 1,
+      listTotal: 0,
+      salesTypeList: [],
+      typeList: [],
+      
+      leftGoodsList: [],
+      rightGoodsList: [],
+
+      leftSelection: [],
+      rightSelection: [],
+
+      xjWalletList: [],
+      flWalletList: [],
     }
   },
 
@@ -182,7 +315,12 @@ export default {
   },
 
   created() {
-    this.getDetail();
+    this.getDictList();
+    this.getWalletList();
+    this.getWarehouseList();
+    if(this.listItem) {
+      this.getDetail();
+    }
   },
 
   methods: {
@@ -194,12 +332,253 @@ export default {
     // 获取详情
     getDetail() {
       getDetail({id: this.listItem.id}).then(res => {
-        this.detailData = res.data;
+        
+      })
+    },
+
+    // 获取仓库列表
+    getWarehouseList() {
+      getWarehouseList({
+        pageNum: 1,
+        pageSize: -1
+      }).then((res) => {
+        this.warehouseList = res.data.records;
       })
     },
 
+    // 获取钱包列表
+    getWalletList() {
+      getWalletList({
+        customerId: JSON.parse(localStorage.getItem("supply_user")).customerId,
+        type: 'COMMONLY'
+      }).then(res => {
+        this.xjWalletList = res.data;
+      })
+      getWalletList({
+        customerId: JSON.parse(localStorage.getItem("supply_user")).customerId,
+        type: 'REBATE'
+      }).then(res => {
+        this.flWalletList = res.data;
+      })
+    },
+
+    // 获取销售类型列表
+    getSalesTypeList() {
+      getSalesTypeList({
+        pageNum: 1,
+        pageSize: -1
+      }).then((res) => {
+        this.salesTypeList = res.data.records;
+      })
+    },
+
+    getDictList() {
+      getDictList({sysDictEnum: 'PRODUCT_TYPE'}).then(res => {
+        this.typeList = res.data;
+      })
+    },
+
+    // 获取商品列表
+    getGoodsList() {
+      getGoodsList({
+        pageNum: this.currentPage,
+        pageSize: 10,
+        mainId: this.screenForm.type,
+        saleId: this.screenForm.salesType,
+        materialCode: this.screenForm.proNum,
+        materialName: this.screenForm.proName,
+        specification: this.screenForm.proModel,
+        price1: this.screenForm.price1,
+        price2: this.screenForm.price2,
+      }).then(res => {
+        let oldGoodsList = this.goodsList;
+        let newGoodsList = res.data.records;
+        for(let i = 0; i < oldGoodsList.length; i++) {
+          let oldItem = oldGoodsList[i]
+          for(let j = 0; j < newGoodsList.length; j++) {
+            let newItem = newGoodsList[j]
+            if(newItem.materialId === oldItem.materialId){
+              newGoodsList[j].selected = true;
+              break;
+            }
+          }
+        }
+        res.data.records.forEach(item => {
+          item.materialName = item.name;
+          item.materialCode = item.number;
+          item.saleTypeName = item.saleName;
+          item.unit = item.baseUnit;
+          item.price = item.batchPrice;
+          item.tax = item.taxRate;
+          item.isDirectTransfer = false;
+          item.directTransferQty = '';
+          item.status1 = '';
+          item.status2 = '';
+          item.rebateAmount = '';
+          item.rebateRate = '';
+        });
+        this.leftGoodsList = res.data.records;
+        this.listTotal = res.data.total;
+      })
+    },
+
+    // 查询重复值并禁选
+    checkboxSelect(row, rowIndex) {
+      if (row.selected) {
+        return false // 禁用
+      }else{
+        return true // 不禁用
+      }
+    },
+
+    // 点击 选择商品
+    openDialog() {
+      this.getSalesTypeList();
+      this.getGoodsList();
+      this.isShowDialog = true;
+    },
+
+    // 提交筛选表单
+    submitScreenForm() {
+      this.currentPage = 1;
+      this.getGoodsList();
+    },
+
+    // 重置筛选表单
+    resetScreenForm() {
+      this.$refs.screenForm.resetFields();
+      this.currentPage = 1;
+      this.getGoodsList();
+    },
+
+    // 更改列表当前页
+    handleTableCurrentChange(val) {
+      this.currentPage = val;
+      this.getGoodsList();
+    },
+
+    // 关闭 弹窗
+    closeDialog() {
+      this.isShowDialog = false;
+    },
+
+    // 左侧列表选择
+    leftSelectionChange(val) {
+      this.leftSelection = val;
+    },
+
+    // 右侧列表选择
+    rightSelectionChange(val) {
+      this.rightSelection = val;
+    },
+
+    // 数组去重
+    delRepeat(arr1, arr2) {
+      let allArr = arr1.concat(arr2); // 两个数组对象合并
+      let newArr = []; // 存放去重后数据的新数组
+      for(let i=0; i<allArr.length; i++){  // 循环allArr数组对象的内容
+        let flag = true;  // 建立标记，判断数据是否重复，true为不重复
+        for(let j=0; j<newArr.length; j++){  // 循环新数组的内容
+          if(allArr[i].materialId == newArr[j].materialId){ // 让allArr数组对象的内容与新数组的内容作比较，相同的话，改变标记为false
+            flag = false;
+          }
+        }
+        if(flag){ // 判断是否重复
+          newArr.push(allArr[i]); // 不重复的放入新数组。  新数组的内容会继续进行上边的循环。
+        }
+      }
+      return newArr;
+    },
+
+    // 全部添加
+    addAllGoods() {
+      this.rightGoodsList = this.delRepeat(this.leftGoodsList, this.rightGoodsList);
+    },
+
+    // 添加
+    addGoods() {
+      this.rightGoodsList = this.delRepeat(this.leftSelection, this.rightGoodsList);
+    },
+
+    // 删除
+    deleteGoods() {
+      let rightGoodsList = this.rightGoodsList;
+      let rightSelection = this.rightSelection;
+      for(let i = 0; i < rightGoodsList.length; i++) {
+        for(let j = 0; j < rightSelection.length; j++) {
+          if(rightSelection[j].materialId == rightGoodsList[i].materialId){
+            this.rightGoodsList.splice(i, 1);
+          }
+        }
+      }
+    },
+
+    // 全部删除
+    deleteAllGoods() {
+      this.rightGoodsList = [];
+    },
+
+    // 确定 添加产品
+    submitAddGoods() {
+      this.goodsList = this.delRepeat(this.rightGoodsList, this.goodsList);
+      this.isShowDialog = false;
+      this.leftGoodsList = [];
+      this.rightGoodsList = [];
+    },
+
+    // 删除产品
+    deleteItem(index) {
+      this.goodsList.splice(index, 1);
+    },
+
+    // 修改返利钱包
+    changeWallet(index) {
+      if(this.goodsList[index].walletRebateId) {
+        let obj = this.flWalletList.find(o => o.customerWalletId == this.goodsList[index].walletRebateId);
+        this.goodsList[index].rebateRate = obj.rebateRate;
+      }else {
+        this.goodsList[index].rebateRate = '';
+      }
+    },
+
+    // 检查库存
+    checkStock() {
+      if(!this.warehouseValue) {
+        return this.$errorMsg('请选择仓库');
+      }
+      let ids = [];
+      this.goodsList.forEach(item => {
+        ids.push(item.materialId);
+      })
+      checkStock({
+        correspondId: this.warehouseValue,
+        materialId: ids.join(',')
+      }).then(res => {
+
+      })
+    },
+    
+    // 保存
     clickSubmitForm() {
+      this.$refs.mainForm.validate((valid) => {
+        if (valid) {
+          let mainName = this.typeList[findElem(this.typeList, 'dictCode', this.mainForm.type)].dictValue;
+          let params = {
+            theTime: this.mainForm.date + ' 00:00:00',
+            mainId: this.mainForm.type,
+            mainName,
+            remark: this.mainForm.remark,
+            type: 1, // 1:普通零售单，2:政策零售单
+            retailOrderItemList: this.goodsList
+          }
+          addData(params).then(res => {
+            this.$successMsg('添加成功');
+            this.goBack();
+            this.$parent.getList();
+          })
 
+        }
+      })
     },
   }
 }
@@ -224,4 +603,22 @@ export default {
       padding-left: 10px;
     }
   }
+  .tables {
+    display: flex;
+    margin-top: 10px;
+    .table {
+      width: 45%;
+    }
+    .buttons {
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      padding: 0 10px;
+      button {
+        margin: 0;
+        margin-top: 10px;
+      }
+    }
+  }
 </style>

src/views/supply/retail/components/retail_return.vue

@@ -1,100 +1,44 @@
 <template>
   <div class="detail-container">
-    <el-page-header @back="goBack" content="审批"></el-page-header>
+    <el-page-header @back="goBack" content="退订"></el-page-header>
 
     <div class="main-title">
-      <div class="title">工程订单</div>
+      <div class="title">订单信息</div>
     </div>
 
     <div class="diy-table-1">
       <el-row>
         <el-col :span="8" class="item">
           <div class="label">订单号</div>
-          <div class="value">{{detailData.billNo}}</div>
+          <div class="value">{{detailData.id}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">订单日期</div>
-          <div class="value">{{detailData.fdate}}</div>
+          <div class="value">{{detailData.theTime}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">单据状态</div>
-          <div class="value">{{detailData.srcStockId}}</div>
+          <div class="value">{{detailData.examineStatus | statusFilter}}</div>
         </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">工程登录单号</div>
-          <div class="value">{{detailData.destStockId}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">项目名称</div>
-          <div class="value">{{detailData.approveDate}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">单据类型</div>
-          <div class="value">{{detailData.approverId}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">经销商编码</div>
-          <div class="value">{{detailData.approverId}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">使用单位</div>
-          <div class="value">{{detailData.approverId}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">安装地址</div>
-          <div class="value">{{detailData.approverId}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">工程编号</div>
-          <div class="value">{{detailData.approverId}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">厂工厂编码</div>
-          <div class="value">{{detailData.approverId}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">工程登录类型</div>
-          <div class="value">{{detailData.approverId}}</div>
+        <el-col :span="16" class="item">
+          <div class="label">备注</div>
+          <div class="value">{{detailData.remark}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">文件编号</div>
-          <div class="value">{{detailData.approverId}}</div>
+          <div class="label">业务员</div>
+          <div class="value">{{detailData.serviceName}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">制单人</div>
-          <div class="value">{{detailData.approverId}}</div>
+          <div class="value">{{detailData.createName}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">制单日期</div>
-          <div class="value">{{detailData.approverId}}</div>
-        </el-col>
-        <el-col :span="24" class="item">
-          <div class="label">格力回复</div>
-          <div class="value">{{detailData.approverId}}</div>
-        </el-col>
-        <el-col :span="24" class="item">
-          <div class="label">格力内部备注</div>
-          <div class="value">{{detailData.approverId}}</div>
-        </el-col>
-        <el-col :span="6" class="item">
           <div class="label">审核人</div>
-          <div class="value">{{detailData.approverId}}</div>
-        </el-col>
-        <el-col :span="6" class="item">
-          <div class="label">审核日期</div>
-          <div class="value">{{detailData.approverId}}</div>
+          <div class="value">{{detailData.examineName}}</div>
         </el-col>
-        <el-col :span="6" class="item">
+        <el-col :span="8" class="item">
           <div class="label">关闭人</div>
-          <div class="value">{{detailData.approverId}}</div>
-        </el-col>
-        <el-col :span="6" class="item">
-          <div class="label">关闭日期</div>
-          <div class="value">{{detailData.approverId}}</div>
-        </el-col>
-        <el-col :span="24" class="item">
-          <div class="label">备注</div>
-          <div class="value">{{detailData.approverId}}</div>
+          <div class="value">{{detailData.closeName}}</div>
         </el-col>
       </el-row>
     </div>
@@ -104,43 +48,49 @@
     </div>
 
     <div class="table" style="margin-top: 20px">
-      <el-table :data="detailData.kingDeeTransferItems" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400">
+      <el-table :data="detailData.retailOrderItemList" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400">
         <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
-        <el-table-column align="center" label="引用记录" prop="materialNumber" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="销售类型" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="产品编码" prop="model" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="产品名称" prop="baseUnitId" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="规格型号" prop="qty" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="单位" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="总数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="是否使用返利" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="返利使用比例" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="是否直调" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="直调数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="已发货数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="单价" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="金额" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="返利" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="备注" prop="qty" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="产品编码" prop="materialCode" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="订单金额" prop="totalAmount" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="返利类型" prop="walletRebateName" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="返利金额" prop="rebateAmount" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="格力折扣" prop="deductAmount" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="现金钱包" prop="walletRebateName2" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="实付金额" prop="payAmount" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="是否直调" prop="isDirectTransfer" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{scope.row.isDirectTransfer ? '是':'否'}}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="原订单数量" prop="oldQty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="税率" prop="tax" min-width="100" show-overflow-tooltip></el-table-column>
       </el-table>
     </div>
 
     <div class="main-title">
       <div class="title">退订信息</div>
-    </div>
+    </div> 
     <div class="diy-table-1">
       <el-row :gutter="0">
         <el-col :span="12" class="item">
           <div class="label">操作人</div>
-          <div class="value">2022123233435342</div>
+          <div class="value">{{detailData.examineName}}</div>
         </el-col>
         <el-col :span="12" class="item">
           <div class="label">退订日期</div>
-          <div class="value">123</div>
+          <div class="value">{{detailData.examineName}}</div>
         </el-col>
         <el-col :span="24" class="item">
           <div class="label">退订说明</div>
-          <div class="value"><el-input v-model="examineForm.remark" placeholder="请输入内容"></el-input></div>
+          <div class="value"><el-input v-model="mainForm.remark" placeholder="请输入内容"></el-input></div>
         </el-col>
       </el-row>
     </div>
@@ -148,13 +98,7 @@
     <div class="page-footer">
       <div class="footer" :class="classObj">
         <el-button type="primary" @click="clickSubmitForm" :loading="formLoading">{{ formLoading ? '提交中 ...' : '提 交' }}</el-button>
-        <el-popconfirm
-          title="确定关闭吗？"
-          @onConfirm="goBack"
-          style="margin-left: 10px;"
-        >
-          <el-button slot="reference">关 闭</el-button>
-        </el-popconfirm>
+        <el-button @click="goBack">关 闭</el-button>
       </div>
     </div>
 
@@ -162,21 +106,30 @@
 </template>
 
 <script>
-import { getDetail } from "@/api/supply/engin";
+import { getDetail, returnData } from "@/api/supply/retail";
 
 export default {
   name: 'RetailReturn',
   componentName: 'RetailReturn',
   props: ['listItem'],
+  filters: {
+    statusFilter(val) {
+      const statusList = [
+        { label: '已保存', value: 'SAVE' },
+        { label: '待审核', value: 'WAIT' },
+        { label: '审核通过', value: 'OK' },
+        { label: '审核驳回', value: 'FAIL' },
+      ];
+      let obj = statusList.find(o => o.value == val);
+      return obj ? obj.label : ''
+    }
+  },
   data() {
     return {
-      printObj: {
-        id: 'printData'
-      },
       detailData: {},
 
       formLoading: false,
-      examineForm: {
+      mainForm: {
         status: true,
         remark: '',
       }
@@ -212,8 +165,20 @@ export default {
       })
     },
 
+    // 提交审批
     clickSubmitForm() {
-
+      this.formLoading = true;
+      returnData({
+        id: this.listItem.id,
+        examineStatus: this.mainForm.status ? 'OK' : 'FAIL',
+        examineRemark: this.mainForm.remark,
+      }).then(res => {
+        this.$successMsg('退订成功');
+        this.goBack();
+        this.$parent.getList();
+      }).finally(res => {
+        this.formLoading = false;
+      })
     },
 
   }

src/views/supply/retail/retail_list.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div v-show="!isShowDetail && !isShowForm">
+    <div v-show="!isShowDetail && !isShowForm && !isShowExamine && !isShowReturn">
       <!-- 筛选条件 -->
       <div class="screen-container">
         <el-form ref="screenForm" :model="screenForm" label-width="100px" size="small" label-position="left">
@@ -73,7 +73,7 @@
             <el-button size="small" type="primary" icon="el-icon-plus" @click="toForm()">新增</el-button>
           </div>
           <div class="fr">
-            <ExportButton :exUrl="'admin/user/mch/export'" :exParams="exParams" />
+            <ExportButton :exUrl="'retail/export'" :exParams="exParams" />
           </div>
         </div>
         <div class="table">
@@ -83,34 +83,39 @@
             <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="货品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="计量单位" prop="unit" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="是否直调" prop="isDirectTransfer" min-width="160" show-overflow-tooltip>
+            <el-table-column align="center" label="计量单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="是否直调" prop="isDirectTransfer" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.isDirectTransfer ? '是':'否'}}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="总数量" prop="totalQty" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="直调数量" prop="directTransferQty" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="出库数量" prop="aaa" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="单价" prop="price" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="金额" prop="totalAmount" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="返利使用比例" prop="rebateRate" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="返利" prop="rebateAmount" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="总数量" prop="totalQty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="出库数量" prop="aaa" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="金额" prop="totalAmount" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="返利使用比例" prop="rebateRate" min-width="110" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="返利" prop="rebateAmount" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="制表人" prop="createName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="制表日期" prop="createTime" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="审核人" prop="examineName" min-width="200" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="审核日期" prop="examineTime" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="制表日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="审核人" prop="examineName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="审核日期" prop="examineTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="审核状态" prop="examineStatus" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.examineStatus | statusFilter}}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="操作" width="160" fixed="right">
+            <el-table-column align="center" label="操作" width="220" fixed="right">
               <template slot-scope="scope">
-                <el-button type="text" @click="toForm(scope.row)">编辑</el-button>
+                <el-button type="text" @click="toForm(scope.row)" v-if="scope.row.examineStatus === 'SAVE'">编辑</el-button>
+                <el-button type="text" @click="toExamine(scope.row)" v-if="scope.row.examineStatus === 'WAIT'">审批</el-button>
+                <el-button type="text" @click="toReturn(scope.row)">退订</el-button>
                 <el-button type="text" @click="toDetail(scope.row)">详情</el-button>
-                <el-popconfirm v-if="scope.row.status" style="margin-left: 10px;" title="确定删除吗？" @onConfirm="handleDelete(scope.row.id)" >
-                  <el-button slot="reference" type="text">删除</el-button>
+                <el-popconfirm style="margin-left: 10px;" title="确定提审吗？" @onConfirm="handleSubmit(scope.row.id)" v-if="scope.row.examineStatus === 'SAVE'" >
+                  <el-button slot="reference" type="text">提审</el-button>
+                </el-popconfirm>
+                <el-popconfirm style="margin-left: 10px;" title="确定关闭吗？" @onConfirm="handleClose(scope.row.id)" v-if="!scope.row.closeTime" >
+                  <el-button slot="reference" type="text">关闭</el-button>
                 </el-popconfirm>
               </template>
             </el-table-column>
@@ -134,23 +139,30 @@
     
     <RetailDetail :listItem="queryItem" v-if="isShowDetail" @backListFormDetail="backList" />
     <RetailForm :listItem="queryItem" v-if="isShowForm" @backListFormDetail="backList" />
+    <RetailExamine :listItem="queryItem" v-if="isShowExamine" @backListFormDetail="backList" />
+    <RetailReturn :listItem="queryItem" v-if="isShowReturn" @backListFormDetail="backList" />
 
   </div>
 </template>
 
 <script>
-import { getList } from "@/api/supply/retail";
+import { getList, closeData, submitData } from "@/api/supply/retail";
 import RetailDetail from "@/views/supply/retail/components/retail_detail";
 import RetailForm from "@/views/supply/retail/components/retail_form";
+import RetailExamine from "@/views/supply/retail/components/retail_examine";
+import RetailReturn from "@/views/supply/retail/components/retail_return";
 
+let that
 export default {
   components: {
     RetailDetail,
     RetailForm,
+    RetailExamine,
+    RetailReturn,
   },
   filters: {
     statusFilter(val) {
-      let obj = this.statusList.find(o => o.value == val);
+      let obj = that.statusList.find(o => o.value == val);
       return obj ? obj.label : ''
     }
   },
@@ -181,13 +193,15 @@ export default {
       queryItem: {},
       isShowDetail: false,
       isShowForm: false,
+      isShowExamine: false,
+      isShowReturn: false,
     }
   },
 
   computed: {
     exParams() {
       return {
-        type: this.screenForm.status,
+        examineStatus: this.screenForm.status,
         id: this.screenForm.orderNum,
         policyCode: this.screenForm.policyCode,
         policyRemark: this.screenForm.policyRemark,
@@ -196,11 +210,15 @@ export default {
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         createBy: this.screenForm.zbMan,
         examineBy: this.screenForm.shMan,
-        status: 1, // 1:普通零售单，2:政策零售单
+        type: 1, // 1:普通零售单，2:政策零售单
       }
     },
   },
 
+  beforeCreate() {
+    that = this;
+  },
+
   created() {
     this.getList();
   },
@@ -222,7 +240,7 @@ export default {
       let params = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
-        type: this.screenForm.status,
+        examineStatus: this.screenForm.status,
         id: this.screenForm.orderNum,
         policyCode: this.screenForm.policyCode,
         policyRemark: this.screenForm.policyRemark,
@@ -231,7 +249,7 @@ export default {
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         createBy: this.screenForm.zbMan,
         examineBy: this.screenForm.shMan,
-        status: 1, // 1:普通零售单，2:政策零售单
+        type: 1, // 1:普通零售单，2:政策零售单
       };
       getList(params).then((res) => {
         this.dataList = res.data.records;
@@ -278,15 +296,41 @@ export default {
       this.isShowDetail = true;
     },
 
+    // 进入审批
+    toExamine(item) {
+      this.queryItem = item;
+      this.isShowExamine = true;
+    },
+
+    // 进入退订
+    toReturn(item) {
+      this.queryItem = item;
+      this.isShowReturn = true;
+    },
+
     backList() {
       this.queryItem = {};
       this.isShowDetail = false;
       this.isShowForm = false;
+      this.isShowExamine = false;
+      this.isShowReturn = false;
     },
 
-    handleDelete(id) {
+    // 关闭
+    handleClose(id) {
+      closeData({id}).then(res => {
+        this.$successMsg();
+        this.getList();
+      })
+    },
 
-    }
+    // 提审
+    handleSubmit(id) {
+      submitData({id}).then(res => {
+        this.$successMsg();
+        this.getList();
+      })
+    },
   }
 }
 </script>