소스 검색

置换单

FengChaoYu 3 년 전
부모
커밋
118119856b

+ 75 - 3
src/api/supply/displace.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 获取列表
 export function getList(params) {
   return request({
-    url: '/retreat/list',
+    url: '/displace-order/list',
     method: 'get',
     params
   })
@@ -12,8 +12,80 @@ export function getList(params) {
 // 获取详情
 export function getDetail(params) {
   return request({
-    url: '/retreat/detail',
+    url: '/displace-order/detail',
     method: 'get',
     params
   })
-}
+}
+
+// 查询引用单明细
+export function queryRefDetail(params) {
+  return request({
+    url: '/displace-order/query-ref-detail',
+    method: 'get',
+    params
+  })
+}
+
+// 新增
+export function addData(params) {
+  return request({
+    url: '/displace-order/add',
+    method: 'post',
+    data: params
+  })
+}
+
+// 编辑
+export function editData(params) {
+  return request({
+    url: '/displace-order/edit',
+    method: 'post',
+    data: params
+  })
+}
+
+// 提交审核
+export function submitData(params) {
+  return request({
+    url: '/displace-order/submit',
+    method: 'post',
+    params
+  })
+}
+
+// 撤回
+export function revokeOrder(params) {
+  return request({
+    url: '/displace-order/revoke',
+    method: 'post',
+    params
+  })
+}
+
+// 删除
+export function deleteOrder(params) {
+  return request({
+    url: '/displace-order/del',
+    method: 'post',
+    params
+  })
+}
+
+// 审批
+export function examineOrder(params) {
+  return request({
+    url: '/displace-order/examine',
+    method: 'post',
+    data: params
+  })
+}
+
+// 退订
+export function returnOrder(params) {
+  return request({
+    url: '/displace-order/refund',
+    method: 'post',
+    data: params
+  })
+}

+ 100 - 66
src/views/supply/displace/components/displace_detail.vue

@@ -9,36 +9,52 @@
       <div class="diy-table-1">
         <el-row :gutter="0">
           <el-col :span="8" class="item">
-            <div class="label">单号</div>
-            <div class="value">{{detailData.retreatOrderNo}}</div>
+            <div class="label">置换单号</div>
+            <div class="value">{{detailData.displaceOrderId}}</div>
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">订单日期</div>
-            <div class="value">{{detailData.retreatTime}}</div>
+            <div class="value">{{ detailData.orderDate ? detailData.orderDate.split(" ")[0] : '' }}</div>
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">单据状态</div>
-            <div class="value">{{detailData.aaa}}</div>
+            <div class="value">{{ $parent.findExamineStatus(detailData.examineStatus) }}</div>
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">原订单号</div>
-            <div class="value">{{detailData.salesType}}</div>
+            <div class="value">{{detailData.orderNo}}</div>
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">订单类型</div>
-            <div class="value">{{detailData.orderNo}}</div>
+            <div class="value">{{ $parent.findOrderType(detailData.orderType) }}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">销售政策编号</div>
+            <div class="value">{{detailData.policyCode}}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">销售政策</div>
+            <div class="value">{{detailData.policyTitle}}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">销售政策说明</div>
+            <div class="value">{{detailData.policyRemark}}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">工程登录编码</div>
+            <div class="value">{{detailData.enginRecordNo}}</div>
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">业务员</div>
-            <div class="value">{{detailData.billNumber}}</div>
+            <div class="value">{{detailData.serviceName}}</div>
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">经销商编号</div>
-            <div class="value">{{detailData.clientName}}</div>
+            <div class="value">{{detailData.customerId}}</div>
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">经销商名称</div>
-            <div class="value">{{detailData.salesDep}}</div>
+            <div class="value">{{detailData.customerName}}</div>
           </el-col>
           <el-col :span="8" class="item">
             <div class="label"></div>
@@ -50,76 +66,92 @@
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">申请人</div>
-            <div class="value">{{detailData.salesDep}}</div>
+            <div class="value">{{detailData.createName}}</div>
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">审核人</div>
-            <div class="value">{{detailData.salesDep}}</div>
-          </el-col>
-          <el-col :span="8" class="item">
-            <div class="label">关闭人</div>
-            <div class="value">{{detailData.salesDep}}</div>
+            <div class="value">{{detailData.confirmName}}</div>
           </el-col>
         </el-row>
       </div>
 
       <div class="main-title">
-        <div class="title">货品信息</div>
+        <div class="title">原订单货品信息</div>
       </div>
       <div class="table">
-        <el-table :data="detailData.retreatDocumentOrder" element-loading-text="Loading" border fit highlight-current-row stripe>
+        <el-table :data="detailData.originItems" element-loading-text="Loading" border fit highlight-current-row stripe>
           <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
-          <el-table-column align="center" label="订单号" prop="orderNumber" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="仓库名称" prop="stockName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="产品编号" prop="productNumber" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="产品名称" prop="productName" 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="materialNumber" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="产品旧编码" prop="materialOldNumber" 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="number" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="含税单价" prop="includedPrice" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="含税金额" prop="includedPrice" min-width="100" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.number * scope.row.includedPrice }}
-            </template>
-          </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="price" min-width="100" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.number * scope.row.price }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="价税合计" prop="totalPrice" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="税率(%)" prop="rate" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="退补标记" prop="refund" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="厂产品代码" prop="factoryNumber" min-width="100" 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="price" 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="totalAmount" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="返利类型" prop="customerWalletName2" 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="discAmount" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="现金钱包" prop="customerWalletName" 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="displaceQty" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="备注" prop="remark" min-width="100" 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>
 
     <div class="main-title">
-        <div class="title">审批记录</div>
-      </div>
-      <div class="diy-table-1">
-        <el-row :gutter="0">
-          <el-col :span="8" class="item">
-            <div class="label">审批人</div>
-            <div class="value">{{detailData.salesDep}}</div>
-          </el-col>
-          <el-col :span="8" class="item">
-            <div class="label">审批结果</div>
-            <div class="value">{{detailData.salesDep}}</div>
-          </el-col>
-          <el-col :span="8" class="item">
-            <div class="label">审批时间</div>
-            <div class="value">{{detailData.salesDep}}</div>
-          </el-col>
-          <el-col :xs="24" :sm="24" :lg="24" class="item">
-            <div class="label">审批说明</div>
-            <div class="value">{{detailData.remark}}</div>
-          </el-col>
-        </el-row>
-      </div>
-    
+      <div class="title">置换货品信息</div>
+    </div>
+    <div class="table">
+      <el-table :data="detailData.items" element-loading-text="Loading" border fit highlight-current-row stripe>
+        <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="materialNumber" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="产品旧编码" prop="materialOldNumber" 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="price" 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="totalAmount" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="返利类型" prop="customerWalletName2" 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="discAmount" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="现金钱包" prop="customerWalletName" 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="remark" min-width="100" 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 class="diy-table-1">
+      <el-row :gutter="0">
+        <el-col :span="8" class="item">
+          <div class="label">审批人</div>
+          <div class="value">{{detailData.salesDep}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">审批结果</div>
+          <div class="value">{{detailData.salesDep}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">审批时间</div>
+          <div class="value">{{detailData.salesDep}}</div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="24" class="item">
+          <div class="label">审批说明</div>
+          <div class="value">{{detailData.remark}}</div>
+        </el-col>
+      </el-row>
+    </div>
+
     <div class="page-footer">
       <div class="footer" :class="classObj">
         <el-button  type="primary" icon="el-icon-printer" v-print="printObj">打 印</el-button>
@@ -139,7 +171,9 @@ import { getDetail } from "@/api/supply/displace";
 export default {
   name: 'DisplaceDetail',
   componentName: 'DisplaceDetail',
-  props: ['listItem'],
+  props: [
+    'listItem'
+  ],
   directives: {
     print
   },
@@ -176,10 +210,10 @@ export default {
 
     // 获取详情
     getDetail() {
-      getDetail({id: this.listItem.id}).then(res => {
+      getDetail({ id: this.listItem.displaceOrderId }).then(res => {
         this.detailData = res.data;
       })
-    },
+    }
   }
 }
 </script>
@@ -203,4 +237,4 @@ export default {
       padding-left: 10px;
     }
   }
-</style>
+</style>

+ 318 - 0
src/views/supply/displace/components/displace_examine.vue

@@ -0,0 +1,318 @@
+<template>
+  <div class="detail-container">
+    <el-page-header @back="goBack" content="审批"></el-page-header>
+
+    <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.displaceOrderId}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">订单日期</div>
+          <div class="value">{{ detailData.orderDate ? detailData.orderDate.split(" ")[0] : '' }}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">单据状态</div>
+          <div class="value">{{ $parent.findExamineStatus(detailData.examineStatus) }}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">原订单号</div>
+          <div class="value">{{detailData.orderNo}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">订单类型</div>
+          <div class="value">{{ $parent.findOrderType(detailData.orderType) }}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">销售政策编号</div>
+          <div class="value">{{detailData.policyCode}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">销售政策</div>
+          <div class="value">{{detailData.policyTitle}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">销售政策说明</div>
+          <div class="value">{{detailData.policyRemark}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">工程登录编码</div>
+          <div class="value">{{detailData.enginRecordNo}}</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.customerId}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">经销商名称</div>
+          <div class="value">{{detailData.customerName}}</div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="24" 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.createName}}</div>
+        </el-col>
+      </el-row>
+    </div>
+
+    <div class="main-title">
+      <div class="title">原订单货品信息</div>
+    </div>
+    <div class="table">
+      <el-table :data="originGoodsList" element-loading-text="Loading" border fit highlight-current-row stripe>
+        <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="materialNumber" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="产品旧编码" prop="materialOldNumber" 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="price" 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="totalAmount" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="返利类型" prop="customerWalletName2" 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="discAmount" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="现金钱包" prop="customerWalletName" 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="displaceQty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="备注" prop="remark" min-width="100" 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 class="table" style="margin-top: 20px">
+      <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="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="materialNumber" min-width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="产品旧编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="规格型号" prop="specification" min-width="200" 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>
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.price" size="small" type="number"></el-input>
+          </template>
+        </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" type="number"></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 || 0) * (scope.row.qty || 0)}}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="返利类型" prop="customerWalletName2" 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="discAmount" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.discAmount" size="small" type="number"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="现金钱包" prop="customerWalletName" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="备注" prop="remark" min-width="200" show-overflow-tooltip>
+          <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="taxRate" min-width="100" show-overflow-tooltip></el-table-column>
+      </el-table>
+    </div>
+
+    <div class="main-title">
+      <div class="title">审批信息</div>
+    </div>
+    <div class="diy-table-1">
+      <el-row :gutter="0">
+        <el-col :span="12" class="item">
+          <div class="label">审批人</div>
+          <div class="value">{{userName}}</div>
+        </el-col>
+        <el-col :span="12" class="item">
+          <div class="label">审批结果</div>
+          <div class="value">
+            <el-radio-group v-model="examineForm.examineResult">
+              <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 v-model="examineForm.examineNote" placeholder="请输入内容"></el-input></div>
+        </el-col>
+      </el-row>
+    </div>
+
+    <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>
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import {examineOrder, getDetail} from "@/api/supply/displace";
+import { getTypeList } from "@/api/common";
+
+export default {
+  name: 'DisplaceExamine',
+  componentName: 'DisplaceExamine',
+  props: ['listItem'],
+  data() {
+    return {
+      detailData: {},
+      goodsList: [],
+      originGoodsList: [],
+      userName: JSON.parse(localStorage.getItem("supply_user")).nickName,
+
+      formLoading: false,
+      examineForm: {
+        displaceOrderId: '',
+        orderType: '',
+        orderNo: '',
+        orderDate: '',
+        mainId: '',
+        mainName: '',
+        enginRecordNo: '',
+        projectNo: '',
+        projectName: '',
+        useUnit: '',
+        installAddress: '',
+        policyId: '',
+        policyCode: '',
+        policyTitle: '',
+        policyRemark: '',
+        serviceId: '',
+        serviceName: '',
+        takeDeposit: '',
+        remark: '',
+        examineStatus: '',
+        examineResult: true,
+        examineNote: '',
+      }
+    }
+  },
+
+  computed: {
+    sidebar() {
+      return this.$store.state.app.sidebar
+    },
+    classObj() {
+      return {
+        hideSidebar: !this.sidebar.opened,
+        openSidebar: this.sidebar.opened
+      }
+    },
+  },
+
+  created() {
+    this.getDetail();
+  },
+
+  methods: {
+    // 返回列表
+    goBack() {
+      this.$emit('backListFormDetail');
+    },
+
+    // 获取详情
+    getDetail() {
+      getDetail({id: this.listItem.displaceOrderId}).then(res => {
+        this.detailData = res.data;
+        this.goodsList = res.data.items;
+        this.originGoodsList = res.data.originItems;
+      })
+    },
+
+    clickSubmitForm() {
+      if (this.formLoading) {
+        return
+      }
+      this.formLoading = true;
+      examineOrder({
+        displaceOrderId: this.listItem.displaceOrderId,
+        examineResult: this.examineForm.examineResult,
+        examineNote: this.examineForm.examineNote,
+        originItems: this.originGoodsList,
+        items: this.goodsList,
+      }).then(res => {
+        this.$successMsg('审批成功');
+        this.$nextTick(() => {
+          this.goBack();
+          this.$parent.getList();
+        })
+      }).finally(res => {
+        this.formLoading = false;
+      })
+    },
+
+  }
+}
+</script>
+
+<style scoped lang="scss">
+  .detail-container {
+    width: 100%;
+    height: 100%;
+  }
+  .main-title {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-top: 20px;
+    height: 60px;
+    border-bottom: 1px solid #DCDFE6;
+    margin-bottom: 20px;
+    .title {
+      font-size: 16px;
+      font-weight: 600;
+      padding-left: 10px;
+    }
+  }
+
+  .add {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border: 1px solid #EBEEF5;
+    border-top: none;
+    height: 50px;
+  }
+
+  ::v-deep input::-webkit-outer-spin-button,
+  ::v-deep input::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+  }
+  ::v-deep input[type='number'] {
+    -moz-appearance: textfield;
+  }
+</style>

+ 786 - 62
src/views/supply/displace/components/displace_form.vue

@@ -9,14 +9,18 @@
     <el-form ref="mainForm" :model="mainForm" label-width="100px" size="small" label-position="left">
       <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-form-item label="订单号" prop="orderNo">
+            <div  >
+              <el-input v-model="mainForm.orderNo" placeholder="请输入订单号" disabled>
+                <el-button slot="append" icon="el-icon-search" @click="openShareDetail" class="choose-order">选择</el-button>
+              </el-input>
+            </div>
           </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" :rules="{ required: true, message: '单据日期不能为空', trigger: 'blur' }">
             <el-date-picker
-              v-model="mainForm.date"
+              v-model="mainForm.orderDate"
               type="date"
               value-format="yyyy-MM-dd"
               style="width: 100%;"
@@ -25,42 +29,46 @@
           </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="mainName">
+            <el-input :value="mainForm.mainName" placeholder="品类" disabled></el-input>
           </el-form-item>
         </el-col>
+        <template v-if="mainForm.policyCode">
+          <el-col :xs="24" :sm="12" :lg="8">
+            <el-form-item label="销售政策编号" prop="policyCode">
+              <el-input :value="mainForm.policyCode" placeholder="销售政策编号" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="8">
+            <el-form-item label="销售政策" prop="policyTitle">
+              <el-input :value="mainForm.policyTitle" placeholder="销售政策" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="8">
+            <el-form-item label="销售政策说明" prop="policyRemark">
+              <el-input :value="mainForm.policyRemark" placeholder="销售政策说明" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </template>
+        <template v-if="mainForm.enginRecordNo">
+          <el-col :xs="24" :sm="12" :lg="8">
+            <el-form-item label="工程登录编码" prop="enginRecordNo">
+              <el-input :value="mainForm.enginRecordNo" placeholder="工程登录编码" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </template>
         <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="orderType">
+            <el-input :value="$parent.findOrderType(mainForm.orderType)"  placeholder="订单类型" disabled></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="serviceName">
+            <el-input :value="mainForm.serviceName" placeholder="业务员" disabled></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="24">
-          <el-form-item label="备注" prop="warehouse">
+          <el-form-item label="备注" prop="remark">
             <el-input v-model="mainForm.remark" placeholder="请输入备注"></el-input>
           </el-form-item>
         </el-col>
@@ -68,62 +76,368 @@
     </el-form>
 
     <div class="main-title">
-      <div class="title">货品信息</div>
-      <div>
-        <el-button type="primary" size="small">检查库存</el-button>
-      </div>
-      
+      <div class="title">原订单货品信息</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="originGoodsList" 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="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="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="saleTypeName" min-width="160" show-overflow-tooltip></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="materialOldNumber" 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="price" 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="totalAmount" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="返利类型" prop="customerWalletName2" 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="discAmount" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="现金钱包" prop="customerWalletName" 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="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="置换数量" prop="displaceQty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="备注" prop="remark" min-width="100" 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" v-if="mainForm.orderNo">
+      <div class="title">置换货品信息</div>
+      <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" v-if="mainForm.orderNo">
+      <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="saleTypeName" min-width="160" show-overflow-tooltip></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="materialOldNumber" 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="price" min-width="160" 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="customerWalletId2" min-width="160" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.customerWalletId2" placeholder="选择返利类型" size="small" clearable @change="changeWallet(scope.$index)">
+              <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="120" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{(scope.row.price * scope.row.qty * (scope.row.rebateRate * 100)) / 100}}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="格力折扣" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{scope.row.qty * scope.row.discAmount}}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="现金钱包" prop="customerWalletId" min-width="160" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.customerWalletId" placeholder="选择现金钱包" size="small" clearable>
+              <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="payAmount" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{((scope.row.price * scope.row.qty) * 100 - ((scope.row.price * scope.row.qty * (scope.row.rebateRate * 100)) / 100) * 100 - ((scope.row.qty * (scope.row.discAmount * 100)) / 100) * 100) / 100}}
+          </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 v-if="!listItem">
+          <template slot-scope="scope">
+            <div>{{ scope.row.status1 | status1Filter }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="仓库状态" prop="status2" min-width="100" show-overflow-tooltip v-if="!listItem">
+          <template slot-scope="scope">
+            <div>{{ status2Filter(scope.row) }}</div>
+          </template>
+        </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="isShowOriginDialog" width="70%" :close-on-click-modal="false">
+      <el-form v-if="mainForm.examineStatus === ''" ref="screenOriginForm" :model="screenOriginForm" label-width="80px" size="small">
+        <el-row :gutter="20">
+          <el-col :xs="24" :sm="12" :lg="8">
+            <el-form-item label="原订单号"
+                          prop="orderNo"
+                          :rules="{ required: true, message: '原订单号不能为空', trigger: 'blur' }"
+            >
+              <el-input v-model="screenOriginForm.orderNo" placeholder="原订单号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6" class="tr">
+            <el-form-item label="">
+              <el-button size="small" type="primary" @click="submitScreenOriginForm">搜索</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="table" style="margin: 10px 0 20px;">
+        <el-table
+          ref="originOrderTable"
+          v-loading="dialogTable_listLoading"
+          :data="dialogTable_dataList"
+          element-loading-text="Loading"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          max-height="270">
+          <el-table-column type="selection" width="55"></el-table-column>
+          <el-table-column align="center" prop="orderType" label="订单类型" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ $parent.findOrderType(dialogTable_data.orderType) }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="saleTypeName" label="销售类型" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" prop="materialName" label="货品名称" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" prop="specification" label="规格型号" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" prop="unit" label="单位" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" prop="qty" label="数量" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" prop="refundableQty" label="可退单置换数" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" prop="displaceQty" label="退订置换数" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.displaceQty" size="small"></el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="isShowOriginDialog = false">关 闭</el-button>
+        <el-button @click="chooseDetail">提 交</el-button>
+      </div>
+    </el-dialog>
+
+
+    <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="mainForm.mainId" placeholder="选择品类" style="width: 100%" disabled>
+                <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%" clearable>
+                <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/displace";
+import {getDetail, queryRefDetail, addData, editData} from "@/api/supply/displace";
+import {checkStock, getWalletList, getWarehouseList} from "@/api/supply/engin";
+import {getDictList, getTypeList} from "@/api/common";
+import {getGoodsList} from "@/api/supply/retail";
 
 export default {
   name: 'DisplaceForm',
   componentName: 'DisplaceForm',
   props: ['listItem'],
+  filters: {
+    status1Filter(val) {
+      if (val === '' || val === null || val === undefined) return '未检查';
+      else if (val === 0) return '无货';
+      else if (val > 0 && val <= 30) return val;
+      else if (val > 30 && val <= 1000) return '有货';
+      else if (val > 1000) return '充足';
+    },
+  },
   data() {
     return {
+      editId: '',
       detailData: {},
       mainForm: {
-
+        displaceOrderId: '',
+        orderType: '',
+        orderNo: '',
+        orderDate: '',
+        mainId: '',
+        mainName: '',
+        enginRecordNo: '',
+        projectNo: '',
+        projectName: '',
+        useUnit: '',
+        installAddress: '',
+        policyId: '',
+        policyCode: '',
+        policyTitle: '',
+        policyRemark: '',
+        serviceId: '',
+        serviceName: '',
+        takeDeposit: '',
+        remark: '',
+        examineStatus: ''
+      },
+      isShowOriginDialog: false,
+      isShowDialog: false,
+      dialogTable_data: null, // 列表订单数据
+      dialogTable_dataList: [],
+      dialogTable_listLoading: false, // 列表加载loading
+      screenOriginForm: {
+        orderNo: 'EOH1543527751456137217'
       },
+      screenForm: {
+        type: '',
+        salesType: '',
+        proNum: '',
+        proName: '',
+        proModel: '',
+        price1: '',
+        price2: '',
+      },
+      currentPage: 1,
+      listTotal: 0,
+
+      salesTypeList: [],
+      typeList: [],
+      goodsList: [],
+      originGoodsList: [],
+      warehouseList: [],
+      warehouseValue: '',
+
+      leftGoodsList: [],
+      rightGoodsList: [],
+
+      leftSelection: [],
+      rightSelection: [],
+
+      xjWalletList: [],
+      flWalletList: []
     }
   },
 
@@ -140,7 +454,20 @@ export default {
   },
 
   created() {
-    this.getDetail();
+    this.getDictList();
+    this.getWalletList();
+    this.getSalesTypeList();
+    this.getWarehouseList();
+
+    if(this.listItem) {
+      this.editId = this.listItem.displaceOrderId;
+      this.getDetail();
+    } else {
+      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();
+    }
   },
 
   methods: {
@@ -151,13 +478,389 @@ export default {
 
     // 获取详情
     getDetail() {
-      getDetail({id: this.listItem.id}).then(res => {
-        this.detailData = res.data;
+      getDetail({id: this.editId}).then(res => {
+        const data = res.data;
+        this.mainForm.displaceOrderId = data.displaceOrderId
+        this.mainForm.orderType = data.orderType
+        this.mainForm.orderNo = data.orderNo
+        this.mainForm.orderDate = data.orderDate
+        this.mainForm.mainId = data.mainId
+        this.mainForm.mainName = data.mainName
+        this.mainForm.enginRecordNo = data.enginRecordNo
+        this.mainForm.projectNo = data.projectNo
+        this.mainForm.projectName = data.projectName
+        this.mainForm.useUnit = data.useUnit
+        this.mainForm.installAddress = data.installAddress
+        this.mainForm.policyId = data.policyId
+        this.mainForm.policyCode = data.policyCode
+        this.mainForm.policyTitle = data.policyTitle
+        this.mainForm.policyRemark = data.policyRemark
+        this.mainForm.serviceId = data.serviceId
+        this.mainForm.serviceName = data.serviceName
+        this.mainForm.takeDeposit = data.takeDeposit
+        this.mainForm.examineStatus = data.examineStatus
+
+        this.originGoodsList = data.originItems
+        this.goodsList = data.items
       })
     },
+    // 原订单列表 - 打开弹窗
+    openShareDetail() {
+      this.isShowOriginDialog = true;
+      if (this.mainForm.examineStatus && this.originGoodsList.length > 0) {
+        this.queryRefDetail()
+      }
+    },
+    submitScreenOriginForm() {
+      this.$refs['screenOriginForm'].validate((valid) => {
+        if (valid) {
+          this.queryRefDetail()
+        }
+      })
+    },
+    queryRefDetail() {
+      this.dialogTable_listLoading = true
+      queryRefDetail({
+        originOrderNo: this.screenOriginForm.orderNo
+      }).then(res => {
+        this.dialogTable_data = res.data;
+        this.dialogTable_dataList = this.dialogTable_data.originItems
+        if (this.mainForm.displaceOrderId) {
+          this.originAfterHandle(this.dialogTable_dataList)
+        }
+        this.dialogTable_listLoading = false;
+      }).catch(() => {
+        this.dialogTable_listLoading = false;
+      })
+    },
+    originAfterHandle() {
+      const data = this.dialogTable_dataList
+      // 历史选中的置换数回显
+      this.$nextTick(() => {
+        for (let i = 0; i < data.length; i++) {
+          this.originGoodsList.forEach(goods => {
+            if (goods.materialId === data[i].materialId) {
+              data[i].displaceQty = goods.displaceQty
+              this.$refs['originOrderTable'].toggleRowSelection(data[i], true)
+            }
+          })
+        }
+      })
+    },
+    chooseDetail() {
+      const tableData = this.$refs['originOrderTable'].selection
+      if (!tableData || tableData.length === 0) {
+        return this.$errorMsg('请选择订单明细')
+      }
+      for (let i = 0; i < tableData.length; i++) {
+        if (!tableData[i].displaceQty || tableData[i].displaceQty <= 0) {
+          return this.$errorMsg(tableData[i].materialName + ':置换数量不能少于0')
+        }
+        if (tableData[i].displaceQty > tableData[i].refundableQty) {
+          return this.$errorMsg(tableData[i].materialName + ':置换数量不能大于可退单置换数 ')
+        }
+      }
+      this.originGoodsList = tableData
 
+      this.mainForm.orderType = this.dialogTable_data.orderType
+      this.mainForm.orderNo = this.dialogTable_data.orderNo
+      this.mainForm.mainId = this.dialogTable_data.mainId
+      this.mainForm.mainName = this.dialogTable_data.mainName
+      this.mainForm.enginRecordNo = this.dialogTable_data.enginRecordNo
+      this.mainForm.projectNo = this.dialogTable_data.projectNo
+      this.mainForm.projectName = this.dialogTable_data.projectName
+      this.mainForm.useUnit = this.dialogTable_data.useUnit
+      this.mainForm.installAddress = this.dialogTable_data.installAddress
+      this.mainForm.policyId = this.dialogTable_data.policyId
+      this.mainForm.policyCode = this.dialogTable_data.policyCode
+      this.mainForm.policyTitle = this.dialogTable_data.policyTitle
+      this.mainForm.policyRemark = this.dialogTable_data.policyRemark
+      this.mainForm.serviceId = this.dialogTable_data.serviceId
+      this.mainForm.serviceName = this.dialogTable_data.serviceName
+      this.mainForm.takeDeposit = this.dialogTable_data.takeDeposit
+      this.isShowOriginDialog = false
+    },
     clickSubmitForm() {
+      this.$refs.mainForm.validate((valid) => {
+        if (valid) {
+          for(let i=0; i<this.goodsList.length; i++) {
+            if (!this.goodsList[i].qty || this.goodsList[i].qty <= 0) {
+              this.$errorMsg(this.goodsList[i].materialName + '数量不能小于0');
+              return;
+            }
+            if(!this.goodsList[i].customerWalletId) {
+              this.$errorMsg('请选择现金钱包');
+              return;
+            }
+          }
+          let params = {
+            orderDate: this.mainForm.orderDate + ' 00:00:00',
+            orderNo: this.mainForm.orderNo,
+            remark: this.mainForm.remark,
+            originItems: this.originGoodsList,
+            items: this.goodsList
+          }
+          if(this.listItem) {
+            params.displaceOrderId = this.editId;
+            editData(params).then(res => {
+              this.$successMsg('编辑成功');
+              this.goBack();
+              this.$parent.getList();
+            })
+          }else {
+            addData(params).then(res => {
+              this.$successMsg('添加成功');
+              this.goBack();
+              this.$parent.getList();
+            })
+          }
+        }
+      })
+    },
+    // 获取钱包列表
+    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;
+      })
+    },
 
+    // 获取产品大类列表
+    getDictList() {
+      getDictList({sysDictEnum: 'PRODUCT_TYPE'}).then(res => {
+        this.typeList = res.data;
+      })
+    },
+
+    // 获取销售类型列表
+    getSalesTypeList() {
+      getTypeList({
+        pageNum: 1,
+        pageSize: -1
+      }).then((res) => {
+        this.salesTypeList = res.data.records;
+      })
+    },
+
+    // 获取仓库列表
+    getWarehouseList() {
+      getWarehouseList({
+        pageNum: 1,
+        pageSize: -1
+      }).then((res) => {
+        this.warehouseList = res.data.records;
+      })
+    },
+    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;
+      }
+      return year + seperator1 + month + seperator1 + strDate;
+    },
+    // 检查库存
+    checkStock() {
+      if(!this.warehouseValue) {
+        return this.$errorMsg('请选择仓库');
+      }
+      if(!this.goodsList) {
+        return this.$errorMsg('请添加货品');
+      }
+      let ids = [];
+      this.goodsList.forEach(item => {
+        ids.push(item.materialId);
+      })
+      checkStock({
+        correspondId: this.warehouseValue,
+        materialId: ids.join(',')
+      }).then(res => {
+        if(res.data) {
+          this.goodsList.forEach((item, index) => {
+            item.status1 = res.data[index].allStockNum;
+            item.status2 = res.data[index].stockNum;
+          })
+        }
+      })
+    },
+    // 点击 选择商品
+    openDialog() {
+      this.getSalesTypeList();
+      this.getGoodsList();
+      this.isShowDialog = true;
+    },
+    // 关闭 弹窗
+    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 = [];
+    },
+
+    // 查询重复值并禁选
+    checkboxSelect(row, rowIndex) {
+      if (row.selected) {
+        return false // 禁用
+      }else{
+        return true // 不禁用
+      }
+    },
+
+    // 删除产品
+    deleteItem(index) {
+      this.goodsList.splice(index, 1);
+    },
+
+    // 提交筛选表单
+    submitScreenForm() {
+      this.currentPage = 1;
+      this.getGoodsList();
+    },
+
+    // 重置筛选表单
+    resetScreenForm() {
+      this.$refs.screenForm.resetFields();
+      this.currentPage = 1;
+      this.getGoodsList();
+    },
+
+    // 更改列表当前页
+    handleTableCurrentChange(val) {
+      this.currentPage = val;
+      this.getGoodsList();
+    },
+    // 修改返利钱包
+    changeWallet(index) {
+      if(this.goodsList[index].customerWalletId2) {
+        let obj = this.flWalletList.find(o => o.customerWalletId == this.goodsList[index].customerWalletId2);
+        this.goodsList[index].rebateRate = obj.rebateRate;
+      }else {
+        this.goodsList[index].rebateRate = '';
+      }
+    },
+    status2Filter(item) {
+      if (item.status2 === '' || item.status2 === null || item.status2 === undefined) return '未检查';
+      else if (item.status2 >= item.qty) return '可用';
+      else return '短缺';
+    },
+    // 获取商品列表
+    getGoodsList() {
+      getGoodsList({
+        pageNum: this.currentPage,
+        pageSize: 10,
+        mainId: this.mainForm.mainId,
+        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 = '';
+          item.productPriceId = item.id;
+        });
+        this.leftGoodsList = res.data.records;
+        this.listTotal = res.data.total;
+      })
     },
   }
 }
@@ -182,4 +885,25 @@ export default {
       padding-left: 10px;
     }
   }
-</style>
+  .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;
+      }
+    }
+  }
+  .choose-order {
+
+  }
+</style>

+ 302 - 0
src/views/supply/displace/components/displace_return.vue

@@ -0,0 +1,302 @@
+<template>
+  <div class="detail-container">
+    <el-page-header @back="goBack" content="退订"></el-page-header>
+
+    <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.enginOrderId}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">订单日期</div>
+          <div class="value">{{detailData.orderDate}}</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="8" class="item">
+          <div class="label">经销商编码</div>
+          <div class="value">{{detailData.customerId}}</div>
+        </el-col>
+        <el-col :span="16" class="item">
+          <div class="label">经销商名称</div>
+          <div class="value">{{detailData.customerName}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">工程信息编号</div>
+          <div class="value">{{detailData.refEnginRecordNo}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">工程项目名称</div>
+          <div class="value">{{detailData.refProjectName}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">工程登录类型</div>
+          <div class="value">{{detailData.refPromiseStatus}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">厂工程编码</div>
+          <div class="value">{{detailData.refFactoryNo}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">使用单位</div>
+          <div class="value">{{detailData.refUseUnit}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">销售类型</div>
+          <div class="value">{{detailData.saleTypeName}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">联系人</div>
+          <div class="value">{{detailData.aaa}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">固定电话</div>
+          <div class="value">{{detailData.aaa}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">移动电话</div>
+          <div class="value">{{detailData.aaa}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">不扣押金</div>
+          <div class="value">{{detailData.takeDeposit ? '是':'否'}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">文件编码</div>
+          <div class="value">{{detailData.fileNo}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">业务员</div>
+          <div class="value">{{detailData.serviceName}}</div>
+        </el-col>
+        <el-col :span="24" class="item">
+          <div class="label">格力回复</div>
+          <div class="value">{{detailData.note1}}</div>
+        </el-col>
+        <el-col :span="24" class="item">
+          <div class="label">格力内部备注</div>
+          <div class="value">{{detailData.note2}}</div>
+        </el-col>
+        <el-col :span="24" class="item">
+          <div class="label">备注</div>
+          <div class="value">{{detailData.remark}}</div>
+        </el-col>
+        <el-col :span="6" class="item">
+          <div class="label">制单人</div>
+          <div class="value">{{detailData.createName}}</div>
+        </el-col>
+        <el-col :span="6" class="item">
+          <div class="label">制单日期</div>
+          <div class="value">{{detailData.createTime}}</div>
+        </el-col>
+        <el-col :span="6" class="item">
+          <div class="label">关闭人</div>
+          <div class="value">{{detailData.closeName}}</div>
+        </el-col>
+        <el-col :span="6" class="item">
+          <div class="label">关闭日期</div>
+          <div class="value">{{detailData.closeTime}}</div>
+        </el-col>
+      </el-row>
+    </div>
+
+    <div class="main-title">
+      <div class="title">货品信息</div>
+    </div>
+
+    <div class="table" style="margin-top: 20px">
+      <el-table :data="detailData.items" 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="useRefCount" 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="materialNumber" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="物料代码" prop="materialOldNumber" 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="baseUnitId" 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="enginNum" min-width="120" 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="customerWalletName2" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="使用返利金额" prop="rebateAmount" min-width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="格力折扣" prop="discAmount" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="现金钱包" prop="customerWalletName" 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="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="退订数量" prop="tdQty" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.tdQty" size="small"></el-input>
+          </template>
+        </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 class="diy-table-1">
+      <el-row :gutter="0">
+        <el-col :span="12" class="item">
+          <div class="label">退订人</div>
+          <div class="value">{{userName}}</div>
+        </el-col>
+        <el-col :span="12" class="item">
+          <div class="label">退订日期</div>
+          <div class="value">{{getDate()}}</div>
+        </el-col>
+        <el-col :span="24" class="item">
+          <div class="label">退订说明</div>
+          <div class="value"><el-input v-model="returnForm.remark" placeholder="请输入退订说明"></el-input></div>
+        </el-col>
+      </el-row>
+    </div>
+
+    <div class="page-footer">
+      <div class="footer" :class="classObj">
+        <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>
+
+  </div>
+</template>
+
+<script>
+import { getOrderDetail, returnCom } from "@/api/supply/engin";
+
+export default {
+  name: 'CommerceReturn',
+  componentName: 'CommerceReturn',
+  props: ['listItem'],
+  filters: {
+    statusFilter(val) {
+      const statusList = [
+        { label: '已保存', value: 'SAVE' },
+        { label: '待审核', value: 'WAIT' },
+        { label: '审核通过', value: 'OK' },
+        { label: '审核驳回', value: 'FAIL' },
+        { label: '已关闭', value: 'CLOSE' },
+      ];
+      let obj = statusList.find(o => o.value == val);
+      return obj ? obj.label : ''
+    }
+  },
+  data() {
+    return {
+      userName: JSON.parse(localStorage.getItem("supply_user")).nickName,
+      detailData: {},
+
+      formLoading: false,
+      returnForm: {
+        remark: '',
+      }
+    }
+  },
+
+  computed: {
+    sidebar() {
+      return this.$store.state.app.sidebar
+    },
+    classObj() {
+      return {
+        hideSidebar: !this.sidebar.opened,
+        openSidebar: this.sidebar.opened
+      }
+    },
+  },
+
+  created() {
+    this.getDetail();
+  },
+
+  methods: {
+    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;
+    },
+
+    // 返回列表
+    goBack() {
+      this.$emit('backListFormDetail');
+    },
+
+    // 获取详情
+    getDetail() {
+      getOrderDetail({id: this.listItem.parentId}).then(res => {
+        this.detailData = res.data;
+      })
+    },
+
+    // 退订
+    clickSubmitForm(val) {
+      this.$confirm('此操作将退订订单, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let params = {
+          enginOrderId: this.detailData.enginOrderId,
+          items: this.detailData.items,
+          refundNote: this.returnForm.remark
+        };
+        returnCom(params).then(res => {
+          this.$successMsg();
+          this.goBack();
+          this.$parent.getList();
+        })
+      }).catch(() => {});
+    },
+
+  }
+}
+</script>
+
+<style scoped lang="scss">
+  .detail-container {
+    width: 100%;
+    height: 100%;
+  }
+  .main-title {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-top: 20px;
+    height: 60px;
+    border-bottom: 1px solid #DCDFE6;
+    margin-bottom: 20px;
+    .title {
+      font-size: 16px;
+      font-weight: 600;
+      padding-left: 10px;
+    }
+  }
+</style>

+ 147 - 51
src/views/supply/displace/displace_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">
@@ -11,18 +11,18 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="原销售订单号" prop="jxsNum">
-                <el-input v-model="screenForm.jxsNum" placeholder="请输入原销售订单号"></el-input>
+              <el-form-item label="原订单号" prop="originOrderNo">
+                <el-input v-model="screenForm.originOrderNo" placeholder="请输入原订单号"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商名称" prop="jxsName">
-                <el-input v-model="screenForm.jxsName" placeholder="请输入经销商名称"></el-input>
+              <el-form-item label="经销商名称" prop="customerKeyword">
+                <el-input v-model="screenForm.customerKeyword" placeholder="请输入经销商名称"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="产品名称" prop="chName">
-                <el-input v-model="screenForm.chName" placeholder="请输入产品名称"></el-input>
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model="screenForm.productName" placeholder="请输入产品名称"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -39,21 +39,24 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="申请人" prop="sqMan">
-                <el-input v-model="screenForm.sqMan" placeholder="请输入申请人"></el-input>
+              <el-form-item label="申请人" prop="createName">
+                <el-input v-model="screenForm.createName" placeholder="请输入申请人"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="审核人" prop="shMan">
-                <el-input v-model="screenForm.shMan" placeholder="请输入审核人"></el-input>
+              <el-form-item label="审核人" prop="confirmName">
+                <el-input v-model="screenForm.confirmName" placeholder="请输入审核人"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="销售订单类型" prop="shMan">
-                <el-input v-model="screenForm.shMan" placeholder="请输入销售订单类型"></el-input>
+              <el-form-item label="订单类型" prop="orderType">
+                <el-select v-model="screenForm.orderType" placeholder="选择订单类型" style="width: 100%">
+                  <el-option label="全部" value="" />
+                  <el-option v-for="item in orderType" :key="item.val" :label="item.label" :value="item.val"></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
-            
+
             <el-col :xs="24" :sm="24" :lg="24" class="tr">
               <el-form-item label="">
                 <el-button size="small" @click="resetScreenForm">清空</el-button>
@@ -75,26 +78,42 @@
         </div>
         <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="retreatOrderNo" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="订单日期" prop="retreatTime" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="原订单号" prop="stockName" 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="productName" 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="totalPrice" 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="number" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="业务员" prop="number" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="申请人" prop="number" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="申请日期" prop="number" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="审核人" prop="number" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="审核日期" prop="number" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="审核状态" prop="remark" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="订单号" prop="displaceOrderId" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="订单日期" prop="orderDate" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="原订单号" prop="orderNo" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="订单类型" min-width="160" show-overflow-tooltip>
+              <template slot-scope="{ row }">
+                {{ findOrderType(row.orderType) }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="经销商编号" prop="customerId" 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="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="specification" 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="createName" min-width="160" 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="confirmName" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="审核日期" prop="confirmTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="审核状态" min-width="100" show-overflow-tooltip>
+              <template slot-scope="{ row }">
+                {{ findExamineStatus(row.examineStatus) }}
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="操作" width="160" fixed="right">
               <template slot-scope="scope">
-                <el-button type="text" @click="toForm(scope.row)">编辑</el-button>
+                <el-popconfirm style="margin-right: 10px;" title="确定撤回吗?" @onConfirm="handleWithdraw(scope.row.displaceOrderId)" v-if="scope.row.examineStatus === 'WAIT'" >
+                  <el-button slot="reference" type="text">撤回</el-button>
+                </el-popconfirm>
+                <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)" v-if="scope.row.examineStatus === 'OK'">退订</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-popconfirm style="margin-left: 10px;" title="确定提审吗?" @onConfirm="handleSubmit(scope.row.displaceOrderId)" v-if="scope.row.examineStatus === 'SAVE'" >
+                  <el-button slot="reference" type="text">提审</el-button>
+                </el-popconfirm>
+                <el-popconfirm style="margin-left: 10px;" title="确定删除吗?" @onConfirm="handleDelete(scope.row.displaceOrderId)" >
                   <el-button slot="reference" type="text">删除</el-button>
                 </el-popconfirm>
               </template>
@@ -116,22 +135,27 @@
         </div>
       </div>
     </div>
-    
+
     <DisplaceDetail :listItem="queryItem" v-if="isShowDetail" @backListFormDetail="backList" />
     <DisplaceForm :listItem="queryItem" v-if="isShowForm" @backListFormDetail="backList" />
-
+    <DisplaceExamine :listItem="queryItem" v-if="isShowExamine" @backListFormDetail="backList" />
+<!--    <DisplaceReturn :listItem="queryItem" v-if="isShowReturn" @backListFormDetail="backList" />-->
   </div>
 </template>
 
 <script>
-import { getList } from "@/api/supply/displace";
+import {deleteOrder, getList, revokeOrder, submitData} from "@/api/supply/displace";
 import DisplaceDetail from "@/views/supply/displace/components/displace_detail";
 import DisplaceForm from "@/views/supply/displace/components/displace_form";
+import DisplaceExamine from "@/views/supply/displace/components/displace_examine";
+import DisplaceReturn from "@/views/supply/displace/components/displace_return";
 
 export default {
   components: {
     DisplaceDetail,
     DisplaceForm,
+    DisplaceExamine,
+    DisplaceReturn
   },
   data() {
     return {
@@ -142,16 +166,33 @@ export default {
       listLoading: false, // 列表加载loading
       screenForm: { // 筛选表单数据
         orderNum: '',
-        jxsNum: '',
-        jxsName: '',
-        chName: '',
-        model: '',
+        originOrderNo: '',
+        customerKeyword: '',
+        productName: '',
         date: '',
+        createName: '',
+        confirmName: '',
+        orderType: '',
       },
-
       queryItem: {},
       isShowDetail: false,
       isShowForm: false,
+      isShowExamine: false,
+      isShowReturn: false,
+      orderType : [
+        { label: '商用工程', val: 'TRADE'},
+        { label: '家用工程', val: 'HOME'},
+        { label: '零售订单', val: 'RETAIL'},
+        { label: '销售政策单', val: 'RETAIL_POLICY'}
+      ],
+      examineStatus : [
+        { label: '保存', val: 'SAVE'},
+        { label: '待审核', val: 'WAIT'},
+        { label: '通过', val: 'OK'},
+        { label: '不通过', val: 'FAIL'},
+        { label: '关闭', val: 'CLOSE'}
+      ],
+
     }
   },
 
@@ -159,15 +200,14 @@ export default {
     exParams() {
       return {
         retreatOrderNo: this.screenForm.orderNum,
-        customerNumber: this.screenForm.jxsNum,
-        customerName: this.screenForm.jxsName,
+        customerKeyword: this.screenForm.jxsNum,
         productName: this.screenForm.chName,
         specification: this.screenForm.model,
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         status: 1, // 1:退货单,2:电商退货单
       }
-    },
+    }
   },
 
   created() {
@@ -191,14 +231,15 @@ export default {
       let params = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
-        retreatOrderNo: this.screenForm.orderNum,
-        customerNumber: this.screenForm.jxsNum,
-        customerName: this.screenForm.jxsName,
-        productName: this.screenForm.chName,
-        specification: this.screenForm.model,
-        startTime: this.screenForm.date ? this.screenForm.date[0] : '',
-        endTime: this.screenForm.date ? this.screenForm.date[1] : '',
-        status: 1, // 1:退货单,2:电商退货单
+        displaceOrderId: this.screenForm.orderNum,
+        originOrderNo: this.screenForm.originOrderNo,
+        customerKeyword: this.screenForm.customerKeyword,
+        productName: this.screenForm.productName,
+        createName: this.screenForm.createName,
+        confirmName: this.screenForm.confirmName,
+        orderType: this.screenForm.orderType,
+        startOrderTime: this.screenForm.date ? this.screenForm.date[0] : '',
+        endOrderTime: this.screenForm.date ? this.screenForm.date[1] : ''
       };
       getList(params).then((res) => {
         this.dataList = res.data.records;
@@ -232,27 +273,82 @@ export default {
       this.currentPage = val;
       this.getList();
     },
-
     // 进入表单
     toForm(item) {
       this.queryItem = item;
       this.isShowForm = true;
     },
 
+    // 进入审批
+    toExamine(item) {
+      this.queryItem = item;
+      this.isShowExamine = true;
+    },
+
     // 进入详情
     toDetail(item) {
       this.queryItem = item;
       this.isShowDetail = true;
     },
 
+    // 进入退订
+    toReturn(item) {
+      this.queryItem = item;
+      this.isShowReturn = true;
+    },
+
     backList() {
       this.queryItem = {};
       this.isShowDetail = false;
       this.isShowForm = false;
+      this.isShowExamine = false;
+      this.isShowReturn = false;
+    },
+    handleSubmit(id) {
+      submitData({id}).then(res => {
+        this.$successMsg();
+        this.getList();
+      })
+    },
+    // 撤回
+    handleWithdraw(id) {
+      revokeOrder({id}).then(res => {
+        this.$successMsg();
+        this.getList();
+      })
     },
 
+    // 删除
     handleDelete(id) {
+      deleteOrder({ids: id}).then(res => {
+        this.$successMsg();
+        this.getList();
+      })
+    },
 
+    // 批量删除
+    batchDelete() {
+      this.$confirm('此操作将永久删除, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let ids = this.multipleSelection.map(item => {
+          return item.parentId;
+        });
+        deleteOrder({ids: ids.join(',')}).then(res => {
+          this.$successMsg();
+          this.getList();
+        })
+      }).catch(() => {});
+    },
+    findOrderType(val) {
+      const obj = this.orderType.find((value) => value.val === val)
+      return obj ? obj.label : ''
+    },
+    findExamineStatus(val) {
+      const obj = this.examineStatus.find((value) => value.val === val)
+      return obj ? obj.label : ''
     }
   }
 }

+ 3 - 7
src/views/supply/engin/components/engin_detail.vue

@@ -17,10 +17,6 @@
           <div class="value">{{detailData.orderDate}}</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="8" class="item">
           <div class="label">经销商编码</div>
           <div class="value">{{detailData.customerId}}</div>
         </el-col>
@@ -74,7 +70,7 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">业务员</div>
-          <div class="value">{{detailData.serviceId}}</div>
+          <div class="value">{{detailData.serviceName}}</div>
         </el-col>
       </el-row>
     </div>
@@ -120,7 +116,7 @@
         </el-row>
       </div>
     </div>
-    
+
     <div class="page-footer">
       <div class="footer" :class="classObj">
         <el-button @click="goBack">关 闭</el-button>
@@ -211,4 +207,4 @@ export default {
       padding-left: 10px;
     }
   }
-</style>
+</style>