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

src/api/finance/rebate_form.js

@@ -24,11 +24,11 @@ export function getRebateOrderAdd(data) {
     })
   }
 // 提审
-export function getRebateOrderApply(data) {
+export function getRebateOrderApply(params) {
     return request({
       url: '/rebate/order/apply',
       method: 'post',
-      data
+      params
     })
   }
 // 列表

src/api/finance/rebate_list.js

@@ -7,3 +7,43 @@ export function getRebateOrderList(params) {
       params
     })
   }
+// 提审
+export function getRebateOrderApply(params) {
+  return request({
+    url: '/rebate/order/apply',
+    method: 'post',
+    params
+  })
+}
+// 审核
+export function getRebateOrderExamine(params) {
+  return request({
+    url: '/rebate/order/examine',
+    method: 'post',
+    params
+  })
+}
+// 复核
+export function getRebateOrderExamine2(data) {
+  return request({
+    url: '/rebate/order/examine2',
+    method: 'post',
+    data
+  })
+}
+// 详情
+export function getRebateOrderDetail(params) {
+  return request({
+    url: '/rebate/order/detail',
+    method: 'get',
+    params
+  })
+}
+// 客户确认
+export function getRebateOrderAck(data) {
+  return request({
+    url: '/rebate/order/ack',
+    method: 'post',
+    data
+  })
+}

src/api/supply/apply.js

@@ -117,4 +117,13 @@ export function getEnginList(params) {
     method: 'get',
     params
   })
+}
+
+// 工程发货申请单 - 获取详情
+export function getEnginDetail(params) {
+  return request({
+    url: '/invoice/detailProject',
+    method: 'get',
+    params
+  })
 }

src/views/basic_data/material/modify_list.vue

@@ -289,7 +289,7 @@
             >
               <template slot-scope="scope">
                 <template v-if="scope.row.examineStatus=='SAVE'">
-                     <el-popconfirm title="这是一段内容确定删除吗？" @onConfirm="handleGetPriceSubmit(scope.row.id)" style="margin-right:10px">
+                     <el-popconfirm title="这是一段内容确定删除吗？" @onConfirm="handleGetPriceSubmit(scope.row.updPriceBillId)" style="margin-right:10px">
                   <el-button type="text" slot="reference">提审</el-button>
                 </el-popconfirm>
                 </template>
@@ -443,8 +443,10 @@ export default {
       });
     },
     handleGetPriceSubmit(id){
+      console.log(id);
       getPriceSubmit({id}).then(res=>{
         this.$successMsg('已提审')
+        this.getList()
       })
     },
     approvalFn(id) {

src/views/finance/change_apply.vue

@@ -78,7 +78,9 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
+              <div v-if="scope.$index == 0">{{ searchForm.customerName }}</div>
               <el-select
+                v-if="scope.$index == 1"
                 filterable
                 v-model="scope.row.customerId"
                 placeholder="请选择"
@@ -109,9 +111,9 @@
               >
                 <el-option
                   v-for="item in scope.row.typeList"
-                  :key="item.id"
+                  :key="item.customerWalletId"
                   :label="item.name"
-                  :value="item.id"
+                  :value="item.customerWalletId"
                 >
                 </el-option>
               </el-select>
@@ -169,7 +171,20 @@ export default {
   data() {
     return {
       listLoading: false, // 列表加载loading
-      dataList: [],
+      dataList: [
+        {
+          customerId: "",
+          name: "",
+          money: "",
+          bz: "",
+        },
+        {
+          customerId: "",
+          name: "",
+          money: "",
+          bz: "",
+        },
+      ],
       searchForm: {
         customerId: "",
         customerName: "",
@@ -186,19 +201,19 @@ export default {
     this.getCustomerData();
   },
   methods: {
-    func(arr, target) {
-      var obj = {};
-      for (var i = 0; i < arr.length; i++) {
-        var item = arr[i].money;
-        if (obj[item] === undefined) {
-          var x = target - item;
-          obj[x] = i;
-        } else {
-          return [obj[item], i];
-        }
-      }
-      return null;
-    },
+    // func(arr, target) {
+    //   var obj = {};
+    //   for (var i = 0; i < arr.length; i++) {
+    //     var item = arr[i].money;
+    //     if (obj[item] === undefined) {
+    //       var x = target - item;
+    //       obj[x] = i;
+    //     } else {
+    //       return [obj[item], i];
+    //     }
+    //   }
+    //   return null;
+    // },
 
     resetFn() {
       this.dataList.forEach((v) => {
@@ -241,23 +256,42 @@ export default {
       let initiatorRemark;
       let receiverRemark;
       let amount;
-      let res = this.func(this.dataList, 0);
-      console.log(res);
-
-      if (this.dataList[res[0]].money > 0) {
-        receiverWalletRebateId = this.dataList[res[0]].customerWalletId;
-        initiatorWalletRebateId = this.dataList[res[1]].customerWalletId;
-        receiverRemark = this.dataList[res[0]].bz;
-        initiatorRemark = this.dataList[res[1]].bz;
-        amount = this.dataList[res[0]].money;
+      // let res = this.func(this.dataList, 0);
+      // console.log(res);
+      // if (this.dataList[res[0]].money > 0) {
+      //   receiverWalletRebateId = this.dataList[res[0]].customerWalletId;
+      //   initiatorWalletRebateId = this.dataList[res[1]].customerWalletId;
+      //   receiverRemark = this.dataList[res[0]].bz;
+      //   initiatorRemark = this.dataList[res[1]].bz;
+      //   amount = this.dataList[res[0]].money;
+      // } else {
+      //   receiverWalletRebateId = this.dataList[res[1]].customerWalletId;
+      //   initiatorWalletRebateId = this.dataList[res[0]].customerWalletId;
+      //   receiverRemark = this.dataList[res[1]].bz;
+      //   initiatorRemark = this.dataList[res[0]].bz;
+      //   amount = this.dataList[res[1]].money;
+      // }
+      // await getTransferAdd({
+      //   receiverWalletRebateId,
+      //   initiatorWalletRebateId,
+      //   receiverRemark,
+      //   initiatorRemark,
+      //   amount: amount * 1,
+      // });
+      console.log(this.dataList);
+      if (this.dataList[0].money > 0) {
+        receiverWalletRebateId = this.dataList[0].name;
+        initiatorWalletRebateId = this.dataList[1].name;
+        initiatorRemark = this.dataList[1].bz;
+        receiverRemark = this.dataList[0].bz;
+        amount = this.dataList[0].money;
       } else {
-        receiverWalletRebateId = this.dataList[res[1]].customerWalletId;
-        initiatorWalletRebateId = this.dataList[res[0]].customerWalletId;
-        receiverRemark = this.dataList[res[1]].bz;
-        initiatorRemark = this.dataList[res[0]].bz;
-        amount = this.dataList[res[1]].money;
+        receiverWalletRebateId = this.dataList[1].name;
+        initiatorWalletRebateId = this.dataList[0].name;
+        initiatorRemark = this.dataList[0].bz;
+        receiverRemark = this.dataList[1].bz;
+        amount = this.dataList[1].money;
       }
-
       await getTransferAdd({
         receiverWalletRebateId,
         initiatorWalletRebateId,
@@ -269,22 +303,21 @@ export default {
     },
     async getUserInfoFn() {
       const res = await getUserInfo({ adminUserId: this.userid });
-      console.log(res);
-      this.searchForm.customerId = res.data.customerId;
+      console.log(res, 1);
+      this.searchForm.customerNumber = res.data.customerNumber;
+      this.dataList[0].customerId = res.data.customerId;
       this.searchForm.customerName = res.data.customerName;
-
-      const res2 = await getWalletCustomerList({
-        customerId: res.data.customerId,
-        type: "REBATE",
-      });
-      console.log(res2);
-
-      res2.data.forEach((v) => {
-        v.money = "";
-        v.bz = "";
-      });
-      this.dataList = res2.data;
-      console.log(this.dataList);
+      // const res2 = await getWalletCustomerList({
+      //   customerId: res.data.customerId,
+      //   type: "REBATE",
+      // });
+      // console.log(res2, 5555);
+      // res2.data.forEach((v) => {
+      //   v.money = "";
+      //   v.bz = "";
+      // });
+      // this.dataList = res2.data;
+      // console.log(this.dataList);
     },
   },
 };

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

@@ -0,0 +1,214 @@
+<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
+                v-model="searchForm.rebateOrderId"
+                placeholder="请输入"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="返利日期" prop="">
+              <el-input
+                v-model="searchForm.theTime"
+                placeholder="请输入"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="备注" prop="">
+              <el-input
+                v-model="searchForm.remark"
+                placeholder="请输入"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="制单人" prop="">
+              <el-input
+                v-model="searchForm.createBy"
+                placeholder="请输入"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="制单日期" prop="">
+              <el-input
+                v-model="searchForm.createTime"
+                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"
+            width="100"
+            type="index"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="返利类型"
+            prop="walletName"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="总返利金额"
+            prop=""
+            min-width="160"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              {{ Math.abs(scope.row.amount) + scope.row.withholdAmount }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="返利金额"
+            prop="amount"
+            min-width="160"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.amount"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="折让金额"
+            prop="allowanceAmount"
+            min-width="160"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.allowanceAmount"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="备注"
+            prop="policyDocNo"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <br />
+    <el-button type="primary" size="small" @click="btnFn">确定</el-button>
+    <el-button type="primary" size="small" @click="resetFn">重置</el-button>
+  </div>
+</template>
+
+<script>
+import { getRebateOrderDetail } from "@/api/finance/rebate_list";
+export default {
+  props: {
+    detailId: {
+      type: String,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      searchForm: {
+        rebateOrderId: "",
+        theTime: "",
+        createBy: "",
+        createTime: "",
+        remark: "",
+      },
+      dataList: [],
+      listLoading: false, // 列表加载loading
+    };
+  },
+  created() {
+    this.getDataList();
+  },
+  methods: {
+    //确定
+    btnFn() {
+      console.log(this.dataList);
+      const res = this.dataList.map((v) => {
+        return {
+          allowanceAmount: v.allowanceAmount,
+          rebateAmount: v.amount,
+        };
+      });
+      console.log(res, 888);
+    },
+    //获取详情数据
+    async getDataList() {
+      let res = await getRebateOrderDetail({ id: this.detailId });
+
+      this.searchForm.rebateOrderId = res.data.id;
+      this.searchForm.theTime = res.data.theTime;
+      this.searchForm.createBy = res.data.createBy;
+      this.searchForm.createTime = res.data.createTime;
+      this.searchForm.remark = res.data.remark;
+      this.dataList = res.data.items;
+    },
+    goBack() {
+      this.$parent.showPage = 1;
+    },
+  },
+};
+</script>
+
+<style>
+</style>

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

@@ -16,27 +16,42 @@
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="返利单号" prop="">
-              <el-input placeholder="请输入"></el-input>
+              <el-input
+                v-model="searchForm.rebateOrderId"
+                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-input
+                v-model="searchForm.theTime"
+                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-input
+                v-model="searchForm.remark"
+                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-input
+                v-model="searchForm.createBy"
+                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-input
+                v-model="searchForm.createTime"
+                placeholder="请输入"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
@@ -77,55 +92,112 @@
           <el-table-column
             label="序号"
             align="center"
-            min-width="100"
+            width="100"
+            type="index"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="经销商编码"
-            prop=""
+            prop="customerNumber"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="经销商名称"
-            prop=""
+            prop="customerName"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="经销商简称"
-            prop=""
+            label="返利类型"
+            prop="walletName"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="返利类型"
-            prop=""
+            label="返利总金额"
+            prop="amount"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="返利总金额"
-            prop=""
+            label="暂扣返利"
+            prop="withholdAmount"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="暂扣返利"
-            prop=""
+            label="政策文件流水号"
+            prop="policyFileNo"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="政策文号"
+            prop="policyDocNo"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="政策年份"
+            prop="policyYear"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="备注"
-            prop=""
+            label="政策月份"
+            prop="policyMonth"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="政策归属部门"
+            prop="policyOrg"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="客户区域"
+            prop="customerArea"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="客户属性"
+            prop="customerAttr"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="奖励实际归属客户"
+            prop="rewardActualCustomers"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="备注1"
+            prop="remark1"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="备注2"
+            prop="remark2"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
@@ -136,34 +208,92 @@
       <el-row :gutter="0">
         <el-col :span="12" class="item">
           <div class="label">审批人</div>
-          <div class="value">2022123233435342</div>
+          <div class="value">{{ this.name }}</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>
+            <el-radio v-model="examineStatus" label="OK">通过</el-radio>
+            <el-radio v-model="examineStatus" label="FAIL">驳回</el-radio>
           </div>
         </el-col>
         <el-col :span="24" class="item">
           <div class="label">审批说明</div>
           <div class="value">
-            <el-input placeholder="请输入内容"></el-input>
+            <el-input
+              v-model="examineRemark"
+              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>
+    <el-button type="primary" size="small" @click="btnFn">确定</el-button>
+    <el-button type="primary" size="small" @click="resetFn">重置</el-button>
   </div>
 </template>
 
 <script>
+import {
+  getRebateOrderDetail,
+  getRebateOrderExamine,
+} from "@/api/finance/rebate_list";
+import { mapGetters } from "vuex";
 export default {
+  props: {
+    detailId: {
+      type: String,
+      required: true,
+    },
+  },
+  computed: { ...mapGetters(["name"]) },
+  data() {
+    return {
+      examineRemark: "",
+      examineStatus: "",
+      searchForm: {
+        rebateOrderId: "",
+        theTime: "",
+        createBy: "",
+        createTime: "",
+        remark: "",
+      },
+      dataList: [],
+      listLoading: false, // 列表加载loading
+    };
+  },
+  created() {
+    this.getDataList();
+  },
   methods: {
+    //重置
+    resetFn() {
+      this.examineRemark = "";
+      this.examineStatus = "";
+    },
+    //确定
+    async btnFn() {
+      await getRebateOrderExamine({
+        id: this.detailId,
+        examineRemark: this.examineRemark,
+        examineStatus: this.examineStatus,
+      });
+      this.$emit("updateList");
+      this.$message.success("审核成功");
+    },
+    //获取详情数据
+    async getDataList() {
+      let res = await getRebateOrderDetail({ id: this.detailId });
+      console.log(res, 11111);
+      this.searchForm.rebateOrderId = res.data.id;
+      this.searchForm.theTime = res.data.theTime;
+      this.searchForm.createBy = res.data.createBy;
+      this.searchForm.createTime = res.data.createTime;
+      this.searchForm.remark = res.data.remark;
+      this.dataList = res.data.items;
+    },
+
     goBack() {
       this.$parent.showPage = 1;
     },

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

@@ -16,27 +16,42 @@
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="返利单号" prop="">
-              <el-input placeholder="请输入"></el-input>
+              <el-input
+                v-model="searchForm.rebateOrderId"
+                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-input
+                v-model="searchForm.theTime"
+                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-input
+                v-model="searchForm.remark"
+                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-input
+                v-model="searchForm.createBy"
+                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-input
+                v-model="searchForm.createTime"
+                placeholder="请输入"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
@@ -77,55 +92,112 @@
           <el-table-column
             label="序号"
             align="center"
-            min-width="100"
+            width="100"
+            type="index"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="经销商编码"
-            prop=""
+            prop="customerNumber"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="经销商名称"
-            prop=""
+            prop="customerName"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="经销商简称"
-            prop=""
+            label="返利类型"
+            prop="walletName"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="返利类型"
-            prop=""
+            label="返利总金额"
+            prop="amount"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="返利金额"
-            prop=""
+            label="暂扣返利"
+            prop="withholdAmount"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="暂扣返利"
-            prop=""
+            label="政策文件流水号"
+            prop="policyFileNo"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="备注"
-            prop=""
+            label="政策文号"
+            prop="policyDocNo"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="政策年份"
+            prop="policyYear"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="政策月份"
+            prop="policyMonth"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="政策归属部门"
+            prop="policyOrg"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="客户区域"
+            prop="customerArea"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="客户属性"
+            prop="customerAttr"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="奖励实际归属客户"
+            prop="rewardActualCustomers"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="备注1"
+            prop="remark1"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="备注2"
+            prop="remark2"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
@@ -139,7 +211,7 @@
       <div class="table">
         <el-table
           v-loading="listLoading"
-          :data="dataList"
+          :data="dataList2"
           element-loading-text="Loading"
           border
           fit
@@ -156,35 +228,35 @@
           <el-table-column
             align="center"
             label="返利单号"
-            prop=""
+            prop="rebateOrderId"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="经销商编码"
-            prop=""
+            prop="customerNumber"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="经销商名称"
-            prop=""
+            prop="customerName"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="返利类型"
-            prop=""
+            prop="walletName"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="总返利金额"
-            prop=""
+            prop="amount"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
@@ -198,84 +270,165 @@
           <el-table-column
             align="center"
             label="折让金额"
-            prop=""
+            prop="allowanceAmount"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="暂扣返利"
-            prop=""
+            prop="withholdAmount"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="折让编号"
-            prop=""
+            prop="allowanceCode"
             min-width="160"
             show-overflow-tooltip
-          ></el-table-column>
+          >
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.allowanceCode"></el-input>
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             label="折让账号"
-            prop=""
+            prop="allowanceAccount"
             min-width="160"
             show-overflow-tooltip
-          ></el-table-column>
+          >
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.allowanceAccount"></el-input>
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             label="已办理折让金额"
-            prop=""
+            prop="handledAllowanceAmount"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="折让对应收款单号"
-            prop=""
+            prop="allowanceOrderNo"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="确认人"
-            prop=""
+            prop="customerName"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="确认日期"
-            prop=""
+            prop="customerConfirmTime"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="复核人"
-            prop=""
+            prop="secondExamineBy"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="复核日期"
-            prop=""
+            prop="secondExamineTime"
             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 class="diy-table-1">
+      <el-row :gutter="0">
+        <el-col :span="12" class="item">
+          <div class="label">复核人</div>
+          <div class="value">{{ this.name }}</div>
+        </el-col>
+        <el-col :span="12" class="item">
+          <div class="label">操作</div>
+          <div class="value">
+            <el-radio v-model="examineStatus" label="OK">复核通过</el-radio>
+            <el-radio v-model="examineStatus" label="FALL">取消复核</el-radio>
+          </div>
+        </el-col>
+        <el-col :span="24" class="item">
+          <div class="label">复核状态</div>
+          <div class="value">
+            <el-input v-model="examineRemark" placeholder=""></el-input>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
+    <br />
+    <el-button type="primary" size="small" @click="btnFn">确定</el-button>
   </div>
 </template>
 
 <script>
+import {
+  getRebateOrderDetail,
+  getRebateOrderExamine2,
+} from "@/api/finance/rebate_list";
+import { mapGetters } from "vuex";
 export default {
+  props: {
+    detailId: {
+      type: String,
+      required: true,
+    },
+  },
+  computed: { ...mapGetters(["name"]) },
+  data() {
+    return {
+      examineRemark: "",
+      examineStatus: "",
+      searchForm: {
+        rebateOrderId: "",
+        theTime: "",
+        createBy: "",
+        createTime: "",
+        remark: "",
+      },
+      dataList: [],
+      dataList2: [],
+      listLoading: false, // 列表加载loading
+    };
+  },
+  created() {
+    this.getDataList();
+  },
   methods: {
+    //确定
+    async btnFn() {
+      await getRebateOrderExamine2({
+        id: this.detailId,
+        examineRemark: this.examineRemark,
+        examineStatus: this.examineStatus,
+      });
+      this.$message.success("复核成功");
+    },
+    //获取详情数据
+    async getDataList() {
+      let res = await getRebateOrderDetail({ id: this.detailId });
+
+      this.searchForm.rebateOrderId = res.data.id;
+      this.searchForm.theTime = res.data.theTime;
+      this.searchForm.createBy = res.data.createBy;
+      this.searchForm.createTime = res.data.createTime;
+      this.searchForm.remark = res.data.remark;
+      this.dataList = res.data.items;
+      this.dataList2 = res.data.items;
+    },
     goBack() {
       this.$parent.showPage = 1;
     },

src/views/finance/rebate_list.vue

@@ -44,27 +44,6 @@
         </el-form>
       </div>
 
-      <!-- 按钮 -->
-      <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>
-
       <!-- 列表 -->
       <div class="mymain-container">
         <div class="table">
@@ -80,7 +59,7 @@
             <el-table-column
               align="center"
               label="状态"
-              prop=""
+              prop="examineStatus"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
@@ -308,15 +287,41 @@
             <el-table-column
               align="center"
               label="操作"
-              min-width="260"
+              min-width="300"
               show-overflow-tooltip
               fixed="right"
             >
-              <template slot-scope="">
-                <el-button type="text" class="textColor">申请</el-button>
-                <el-button type="text" class="textColor">审核</el-button>
-                <el-button type="text" class="textColor">复核</el-button>
-                <el-button type="text" class="textColor">详情</el-button>
+              <template slot-scope="scope">
+                <el-button
+                  type="text"
+                  class="textColor"
+                  @click="applyFn(scope.row.rebateOrderId)"
+                  >申请</el-button
+                >
+                <el-button
+                  type="text"
+                  class="textColor"
+                  @click="examineFn(scope.row.rebateOrderId)"
+                  >审核</el-button
+                >
+                <el-button
+                  type="text"
+                  class="textColor"
+                  @click="reviewFn(scope.row.rebateOrderId)"
+                  >复核</el-button
+                >
+                <el-button type="text" class="textColor" @click="infoFn"
+                  >详情</el-button
+                >
+                <el-button type="text" class="textColor" @click="detail2"
+                  >详情2</el-button
+                >
+                <el-button
+                  type="text"
+                  class="textColor"
+                  @click="confirmFn(scope.row.rebateOrderId)"
+                  >确认</el-button
+                >
               </template>
             </el-table-column>
           </el-table>
@@ -335,25 +340,36 @@
       </div>
     </div>
     <RebateListApply v-else-if="showPage == 2" />
-    <RebateListExamine v-else-if="showPage == 3" />
-    <RebateListReview v-else-if="showPage == 4" />
+    <RebateListExamine
+      @updateList="updateList"
+      :detailId="detailId"
+      v-else-if="showPage == 3"
+    />
+    <RebateListReview :detailId="detailId" v-else-if="showPage == 4" />
     <!-- 详情 -->
     <RebateListDetail v-else-if="showPage == 5" />
+    <!-- 确定 -->
+    <RebateListConfirm :detailId="detailId" v-else-if="showPage == 6" />
   </div>
 </template>
 
 <script>
-import { getRebateOrderList } from "@/api/finance/rebate_list";
+import {
+  getRebateOrderList,
+  getRebateOrderApply,
+} from "@/api/finance/rebate_list";
 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";
+import RebateListConfirm from "./components/rebate_list-confirm";
 export default {
   components: {
     RebateListDetail,
     RebateListApply,
     RebateListExamine,
     RebateListReview,
+    RebateListConfirm,
   },
   data() {
     return {
@@ -364,6 +380,7 @@ export default {
       searchForm: {}, //搜索表单
       listLoading: false, // 列表加载loading
       showPage: 1,
+      detailId: null,
     };
   },
   created() {
@@ -373,25 +390,43 @@ export default {
     });
   },
   methods: {
+    //更新列表数据
+    updateList() {
+      this.getDataList({
+        pageSize: this.pageSize,
+        pageNum: this.currentPage,
+      });
+    },
     //获取列表数据
     async getDataList(data) {
       const res = await getRebateOrderList(data);
       this.dataList = res.data.records;
       this.listTotal = res.data.total;
     },
+    //确认
+    confirmFn(id) {
+      this.detailId = id;
+      this.showPage = 6;
+    },
     //复核
-    reviewFn() {
+    reviewFn(id) {
+      this.detailId = id;
       this.showPage = 4;
     },
     //审核
-    examineFn() {
+    examineFn(id) {
+      this.detailId = id;
       this.showPage = 3;
     },
     //申请
-    applyFn() {
+    async applyFn(id) {
+      await getRebateOrderApply({ id });
+      this.$message.success("申请成功");
+    },
+    //详情2
+    detail2() {
       this.showPage = 2;
     },
-
     //详情
     infoFn() {
       this.showPage = 5;

src/views/supply/apply/components/apply_form.vue

@@ -11,7 +11,7 @@
     <el-form ref="mainForm" :model="mainForm" :rules="mainFormRules" label-width="90px" size="small" label-position="right">
       <el-row :gutter="20">
         <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="订单号" prop="id">
+          <el-form-item label="订单号" prop="orderNum">
             <el-input v-model="mainForm.orderNum" placeholder="系统自动生成" readonly></el-input>
           </el-form-item>
         </el-col>
@@ -469,6 +469,9 @@ export default {
               return;
             }
           }
+          if(!this.screenForm.warehouse) {
+            return this.$errorMsg('请选择仓库');
+          }
 
           let correspondName = this.warehouseList[findElem(this.warehouseList, 'id', this.screenForm.warehouse)].name;
           let params = {

src/views/supply/apply/components/engin_form.vue

@@ -3,22 +3,22 @@
     <el-page-header @back="goBack" :content="listItem ? '编辑':'新增'"></el-page-header>
 
     <div class="main-title">
-      <div class="title">发货申请单信息</div>
+      <div class="title">工程发货申请单信息</div>
     </div>
 
     <div style="font-size: 12px; color: #333; margin-bottom: 20px;">注：发货申请时，库存数量为实时数量，请选择完成选择后及时保存提交，否则数量可能有变，被其他商家开单而导致库存不足。</div>
 
-    <el-form ref="mainForm" :model="mainForm" :rules="mainFormRules" label-width="90px" size="small" label-position="right">
+    <el-form ref="mainForm" :model="mainForm" :rules="mainFormRules" label-width="100px" size="small" label-position="right">
       <el-row :gutter="20">
         <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="订单号" prop="id">
+          <el-form-item label="发货申请单" prop="orderNum">
             <el-input v-model="mainForm.orderNum" placeholder="系统自动生成" readonly></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-form-item label="单据日期" prop="orderDate">
             <el-date-picker
-              v-model="mainForm.date"
+              v-model="mainForm.orderDate"
               type="date"
               value-format="yyyy-MM-dd"
               style="width: 100%;"
@@ -26,11 +26,8 @@
             </el-date-picker>
           </el-form-item>
         </el-col>
-        <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="制单人" prop="createMan">
-            <el-input v-model="mainForm.createMan" readonly></el-input>
-          </el-form-item>
-        </el-col>
+      </el-row>
+      <el-row :gutter="20">
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="经销商编号" prop="jxsNum">
             <el-input v-model="mainForm.jxsNum" readonly></el-input>
@@ -41,17 +38,87 @@
             <el-input v-model="mainForm.jxsName" readonly></el-input>
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :xs="24" :sm="12" :lg="8">
+          <el-form-item label="工程登录编号" prop="loginNum">
+            <el-input v-model="mainForm.loginNum" placeholder="请输入工程登录编号"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xs="24" :sm="12" :lg="8">
+          <el-form-item label="工程项目名称" prop="enginName">
+            <el-input v-model="mainForm.enginName" placeholder="请输入工程项目名称"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xs="24" :sm="12" :lg="8">
+          <el-form-item label="工程登录类型" prop="loginType">
+            <el-input v-model="mainForm.loginType" placeholder="请输入工程登录类型"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xs="24" :sm="12" :lg="8">
+          <el-form-item label="厂工程编号" prop="factoryNum">
+            <el-input v-model="mainForm.factoryNum" placeholder="请输入厂工程编号"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xs="24" :sm="12" :lg="8">
+          <el-form-item label="使用单位" prop="company">
+            <el-input v-model="mainForm.company" placeholder="请输入使用单位"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :xs="24" :sm="12" :lg="8">
+          <el-form-item label="联系人" prop="contactMan">
+            <el-input v-model="mainForm.contactMan" placeholder="请输入联系人" readonly></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xs="24" :sm="12" :lg="8">
+          <el-form-item label="固定电话" prop="tel">
+            <el-input v-model="mainForm.tel" placeholder="请输入固定电话" readonly></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xs="24" :sm="12" :lg="8">
+          <el-form-item label="移动电话" prop="phone">
+            <el-input v-model="mainForm.phone" placeholder="请输入移动电话" readonly></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="24">
+          <el-form-item label="安装地址" prop="address">
+            <el-input v-model="mainForm.address" placeholder="请输入安装地址"></el-input>
+          </el-form-item>
+        </el-col>
         <el-col :xs="24" :sm="24" :lg="24">
           <el-form-item label="备注" prop="remark">
             <el-input v-model="mainForm.remark" placeholder="请输入备注"></el-input>
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row :gutter="20">
         <el-col :xs="24" :sm="8" :lg="8">
           <el-form-item label="附件" prop="fileUrl">
             <fileUpload :fileList="fileList" />
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row :gutter="20">
+        <el-col :xs="24" :sm="12" :lg="8">
+          <el-form-item label="制单人" prop="createMan">
+            <el-input v-model="mainForm.createMan" readonly></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xs="24" :sm="12" :lg="8" style="height: 51px;">
+          <el-form-item label="制单日期" prop="createDate">
+            <el-date-picker
+              v-model="mainForm.createDate"
+              readonly
+              type="datetime"
+              value-format="yyyy-MM-dd hh:mm:ss"
+              style="width: 100%;"
+              placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
 
     <div class="main-title">
@@ -70,18 +137,16 @@
       <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="orderId" min-width="180" 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="saleTypeName" 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="qty" min-width="80" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="申请数量" prop="invoiceNum" min-width="110" show-overflow-tooltip>
+        <el-table-column align="center" label="数量" prop="invoiceNum" min-width="110" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.invoiceNum" size="small"></el-input>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="已申请数量" prop="alreadyInvoiceNum" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="未申请数量" prop="refundableQty" min-width="100" show-overflow-tooltip> </el-table-column>
         <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.remark" size="small"></el-input>
@@ -106,28 +171,44 @@
     </div>
 
     <el-dialog title="添加产品" :visible.sync="isShowDialog" width="80%">
-      <el-form ref="screenForm" :model="screenForm" size="small" label-position="left" label-width="70px">
+      <el-form ref="screenForm" :model="screenForm" size="small" label-position="left" label-width="100px">
         <el-row :gutter="20">
-          <el-col :xs="12" :sm="6" :lg="6">
-            <el-form-item prop="warehouse" label="选择仓库">
-              <el-select v-model="screenForm.warehouse" placeholder="请选择仓库" size="small" filterable clearable :disabled="goodsList.length > 0 || tableSelection.length > 0">
-                <el-option :label="item.name" :value="item.id" v-for="(item, index) in warehouseList" :key="index"></el-option>
-              </el-select>
+          <el-col :xs="12" :sm="12" :lg="6">
+            <el-form-item prop="orderNum" label="工程登录编号">
+              <el-input v-model="screenForm.orderNum" placeholder="请输入工程登录编号"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :xs="12" :sm="6" :lg="6">
-            <el-form-item prop="type" label="产品大类">
-              <el-select v-model="screenForm.type" placeholder="选择产品大类" style="width: 100%" :disabled="goodsList.length > 0 || tableSelection.length > 0">
-                <el-option v-for="item in typeList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
-              </el-select>
+          <el-col :xs="12" :sm="12" :lg="6">
+            <el-form-item prop="orderNum" label="工程名称">
+              <el-input v-model="screenForm.orderNum" placeholder="请输入工程名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="12" :sm="12" :lg="6">
+            <el-form-item prop="orderNum" label="规格型号">
+              <el-input v-model="screenForm.orderNum" placeholder="请输入规格型号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="12" :sm="12" :lg="6">
+            <el-form-item label="发货申请日期" prop="date">
+              <el-date-picker
+                v-model="screenForm.date"
+                type="datetimerange"
+                range-separator="至"
+                style="width: 100%; height: 33px"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期">
+              </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :xs="12" :sm="6" :lg="6">
-            <el-form-item prop="orderNum" label="订单号">
-              <el-input v-model="screenForm.orderNum" placeholder="请输入订单号"></el-input>
+          <el-col :xs="12" :sm="12" :lg="6">
+            <el-form-item prop="warehouse" label="选择仓库">
+              <el-select v-model="screenForm.warehouse" placeholder="请选择仓库" size="small" filterable clearable :disabled="goodsList.length > 0 || tableSelection.length > 0">
+                <el-option :label="item.name" :value="item.id" v-for="(item, index) in warehouseList" :key="index"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
-          <el-col :xs="12" :sm="6" :lg="6" class="tr">
+          <el-col :xs="12" :sm="12" :lg="18" class="tr">
             <el-form-item label="">
               <el-button size="small" @click="resetScreenForm">清空</el-button>
               <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
@@ -139,7 +220,8 @@
       <div class="table">
         <el-table :data="tableGoodsList" element-loading-text="Loading" border fit highlight-current-row stripe height="400" @selection-change="tableSelectionChange">
           <el-table-column align="center" type="selection" width="55" :selectable='checkboxSelect'></el-table-column>
-          <el-table-column align="center" label="订单号" prop="orderId" min-width="180" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="订单类型" prop="orderId" min-width="180" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="工程登录编号" prop="orderId" min-width="180" 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="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>
@@ -183,7 +265,7 @@
 </template>
 
 <script>
-import { getApplyDetail, addApply, editApply, getGoodsList, getWarehouseList, getDealerList } from "@/api/supply/apply";
+import { getEnginDetail, addApply, editApply, getGoodsList, getWarehouseList, getDealerList } from "@/api/supply/apply";
 import { getDictList } from '@/api/common'
 import { findElem } from '@/utils/util'
 import fileUpload from '@/components/Common/file-upload.vue'
@@ -192,8 +274,8 @@ export default {
   components: {
     fileUpload
   },
-  name: 'ApplyForm',
-  componentName: 'ApplyForm',
+  name: 'EnginForm',
+  componentName: 'EnginForm',
   props: ['listItem'],
   filters: {
     stockFilter(val) {
@@ -208,16 +290,24 @@ export default {
     return {
       mainForm: {
         orderNum: '',
-        date: '',
+        orderDate: '',
         jxsNum: '',
         jxsName: '',
+        loginNum: '',
+        enginName: '',
+        loginType: '',
+        factoryNum: '',
+        company: '',
+        contactMan: '',
+        tel: '',
+        phone: '',
+        address: '',
         remark: '',
         createMan: '',
+        createDate: '',
       },
       mainFormRules: {
-        date: [
-          { required: true, message: '请选择单据日期', trigger: 'change' }
-        ],
+        orderDate: [{ required: true, message: '请选择单据日期', trigger: 'change' }],
       },
       dealerList: [],
       fileList: [],
@@ -261,6 +351,7 @@ export default {
       this.mainForm.jxsNum = JSON.parse(localStorage.getItem("supply_user")).customerId;
       this.mainForm.jxsName = JSON.parse(localStorage.getItem("supply_user")).customerName;
       this.mainForm.createMan = JSON.parse(localStorage.getItem("supply_user")).nickName;
+      this.mainForm.createDate = this.getDate();
     }
   },
 
@@ -270,9 +361,25 @@ export default {
       this.$emit('backListFormDetail');
     },
 
+    getDate() {
+      var date = new Date();
+      var seperator1 = "-";
+      var year = date.getFullYear();
+      var month = date.getMonth() + 1;
+      var strDate = date.getDate();
+      if (month >= 1 && month <= 9) {
+          month = "0" + month;
+      }
+      if (strDate >= 0 && strDate <= 9) {
+          strDate = "0" + strDate;
+      }
+      var currentdate = year + seperator1 + month + seperator1 + strDate;
+      return currentdate;
+    },
+
     // 获取详情
     getDetail() {
-      getApplyDetail({id: this.listItem.id}).then(res => {
+      getEnginDetail({id: this.listItem.id}).then(res => {
         let data = res.data;
         this.mainForm.orderNum = data.id;
         this.mainForm.date = data.orderTime;
@@ -469,6 +576,9 @@ export default {
               return;
             }
           }
+          if(!this.screenForm.warehouse) {
+            return this.$errorMsg('请选择仓库');
+          }
 
           let correspondName = this.warehouseList[findElem(this.warehouseList, 'id', this.screenForm.warehouse)].name;
           let params = {

src/views/supply/apply/engin_list.vue

@@ -81,9 +81,9 @@
             <el-table-column align="center" label="发货申请单" prop="id" min-width="180" 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="correspondName" min-width="120" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="工程登录编码" prop="aaa" min-width="120" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="工程名称" prop="aaa" min-width="120" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="使用单位" prop="aaa" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="工程登录编码" prop="enginOrderNo" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="工程名称" prop="refProjectName" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="使用单位" prop="refUseUnit" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="经销商编码" prop="customerNumber" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="经销商名称" prop="customerName" 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>