Merge tag 'Hotfix-mo-26' into develop

Finish Hotfix-mo-26

src/api/common.js

@@ -70,4 +70,13 @@ export function getCategoryList(params) {
     method: 'get',
     params
   })
+}
+
+// 联查单据
+export function checkOrder(params) {
+  return request({
+    url: '/invoice/listInvoiceRetreat',
+    method: 'get',
+    params
+  })
 }

src/components/Common/check-order.vue

@@ -0,0 +1,116 @@
+<template>
+  <div class="detail-container">
+    <el-page-header @back="goBack" content="联查单据"></el-page-header>
+
+    <div class="table" style="margin-top: 20px">
+      <el-table
+        :data="dataList"
+        element-loading-text="Loading"
+        border
+        fit
+        highlight-current-row
+        stripe
+        show-summary
+        :summary-method="$getSummaries">
+        <el-table-column align="center" label="发货单" prop="id" min-width="180" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="订单类别" prop="inOrderType" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.inOrderType | orderTypeFilter }}
+          </template>
+        </el-table-column>
+        <el-table-column align="right" label="价税合计" prop="payAmount" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.payAmount | numToFixed }}
+          </template>
+        </el-table-column>
+        <el-table-column align="right" label="折扣后金额" prop="payAmount" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.payAmount | numToFixed }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="发货日期" prop="orderTime" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="仓库" prop="correspondName" 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="materialCode" 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="right" label="无税金额" prop="noTotalAmount" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.noTotalAmount | numToFixed }}
+          </template>
+        </el-table-column>
+        <el-table-column align="right" label="单价" prop="afterTaxPrice" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.afterTaxPrice | numToFixed }}
+          </template>
+        </el-table-column>
+        <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
+
+      </el-table>
+    </div>
+
+    <div class="page-footer">
+      <div class="footer">
+        <el-button @click="goBack">关 闭</el-button>
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import { checkOrder } from "@/api/common";
+
+export default {
+  name: 'RetailReturn',
+  componentName: 'RetailReturn',
+  props: ['checkOrderId'],
+  filters: {
+    orderTypeFilter(val) {
+      const MAP = {
+        1: '发货单',
+        2: '退货单'
+      }
+      return MAP[val];
+    }
+  },
+  data() {
+    return {
+      dataList: [],
+    }
+  },
+
+  created() {
+    this.getDetail();
+  },
+
+  methods: {
+    // 返回详情
+    goBack() {
+      this.$emit('backDetail');
+    },
+
+    // 获取详情
+    getDetail() {
+      checkOrder({mainOrderId: this.checkOrderId}).then(res => {
+        if(res.data) {
+          res.data.forEach(item => {
+            item.sums1 = ['refundableQty'];
+            item.sums2 = ['payAmount', 'afterTaxPrice', 'noTotalAmount'];
+          })
+        }
+        this.dataList = res.data;
+      })
+    },
+
+  }
+}
+</script>
+
+<style scoped lang="scss">
+  .detail-container {
+    width: 100%;
+    height: 100%;
+  }
+</style>

src/views/supply/engin/components/commerce_detail.vue

@@ -1,205 +1,210 @@
 <template>
   <div class="detail-container">
-    <el-page-header @back="goBack" content="详情"></el-page-header>
 
-    <div id="printData">
-      <div class="main-title">
-        <div class="title">工程订单</div>
-      </div>
+    <div v-show="!isShowCheckOrder">
+
+      <el-page-header @back="goBack" content="详情"></el-page-header>
+
+      <div id="printData">
+        <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.enginOrderNo}}</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.customerNumber}}</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.confirmName}}</div>
+            </el-col>
+            <el-col :span="6" class="item">
+              <div class="label">审核日期</div>
+              <div class="value">{{detailData.confirmTime}}</div>
+            </el-col>
+            <el-col :span="6" class="item">
+              <div class="label">最后更新人</div>
+              <div class="value">{{detailData.updateName}}</div>
+            </el-col>
+            <el-col :span="6" class="item">
+              <div class="label">最后更新日期</div>
+              <div class="value">{{detailData.updateTime}}</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-col :span="24" class="item">
+              <div class="label">审批说明</div>
+              <div class="value">{{detailData.examineNote}}</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"
+            show-summary
+            :summary-method="$getSummaries">
+            <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="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.price | numToFixed }}
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="工程登录数量" prop="enginNum" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="数量" prop="number" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="订单金额" prop="totalAmount" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.totalAmount | numToFixed }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="返利类型" prop="customerWalletName2" min-width="140" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="使用返利金额" prop="payRebateAmount" min-width="120" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.payRebateAmount | numToFixed }}
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="格力折扣" prop="discAmount" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.discAmount | numToFixed }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="现金钱包" prop="customerWalletName" min-width="140" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="实付金额" prop="payAmount" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.payAmount | numToFixed }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="是否直调" prop="isDirectTransfer" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.isDirectTransfer ? '是' : '否' }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="原订单数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="税率" prop="tax" min-width="100" show-overflow-tooltip></el-table-column>
+          </el-table>
+        </div>
 
-      <div class="diy-table-1">
-        <el-row>
-          <el-col :span="8" class="item">
-            <div class="label">工程订单号</div>
-            <div class="value">{{detailData.enginOrderNo}}</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.customerNumber}}</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.confirmName}}</div>
-          </el-col>
-          <el-col :span="6" class="item">
-            <div class="label">审核日期</div>
-            <div class="value">{{detailData.confirmTime}}</div>
-          </el-col>
-          <el-col :span="6" class="item">
-            <div class="label">最后更新人</div>
-            <div class="value">{{detailData.updateName}}</div>
-          </el-col>
-          <el-col :span="6" class="item">
-            <div class="label">最后更新日期</div>
-            <div class="value">{{detailData.updateTime}}</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-col :span="24" class="item">
-            <div class="label">审批说明</div>
-            <div class="value">{{detailData.examineNote}}</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"
-          show-summary
-          :summary-method="$getSummaries">
-          <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="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.price | numToFixed }}
-            </template>
-          </el-table-column>
-          <el-table-column align="right" label="工程登录数量" prop="enginNum" min-width="120" show-overflow-tooltip></el-table-column>
-          <el-table-column align="right" label="数量" prop="number" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="right" label="订单金额" prop="totalAmount" min-width="100" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.totalAmount | numToFixed }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="返利类型" prop="customerWalletName2" min-width="140" show-overflow-tooltip></el-table-column>
-          <el-table-column align="right" label="使用返利金额" prop="payRebateAmount" min-width="120" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.payRebateAmount | numToFixed }}
-            </template>
-          </el-table-column>
-          <el-table-column align="right" label="格力折扣" prop="discAmount" min-width="100" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.discAmount | numToFixed }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="现金钱包" prop="customerWalletName" min-width="140" show-overflow-tooltip></el-table-column>
-          <el-table-column align="right" label="实付金额" prop="payAmount" min-width="100" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.payAmount | numToFixed }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="是否直调" prop="isDirectTransfer" min-width="100" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.isDirectTransfer ? '是' : '否' }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="原订单数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="税率" prop="tax" min-width="100" show-overflow-tooltip></el-table-column>
-        </el-table>
-      </div>
-
-    </div>
-
-    <div class="page-footer">
-      <div class="footer">
-        <el-button type="danger" @click="closeData" v-if="detailData.examineStatus === 'SAVE' || detailData.examineStatus === 'WAIT'">关闭订单</el-button>
-        <el-button type="primary" @click="openDirectDialog">提前开票</el-button>
-        <el-button type="primary" @click="overData">直调完结</el-button>
-        <el-button type="primary" @click="openDeliverDialog" :disabled="detailData.directTransferStatus">直调发货</el-button>
-        <el-button @click="goBack">返回</el-button>
+      <div class="page-footer">
+        <div class="footer">
+          <el-button type="success" @click="toCheckOrder">联查单据</el-button>
+          <el-button type="danger" @click="closeData" v-if="detailData.examineStatus === 'SAVE' || detailData.examineStatus === 'WAIT'">关闭订单</el-button>
+          <el-button type="primary" @click="openDirectDialog">提前开票</el-button>
+          <el-button type="primary" @click="overData">直调完结</el-button>
+          <el-button type="primary" @click="openDeliverDialog" :disabled="detailData.directTransferStatus">直调发货</el-button>
+          <el-button @click="goBack">返回</el-button>
+        </div>
       </div>
     </div>
 
@@ -332,15 +337,21 @@
       </span>
     </el-dialog>
 
+    <CheckOrder :checkOrderId="checkOrderId" v-if="isShowCheckOrder" @backDetail="backDetail" />
+
   </div>
 </template>
 
 <script>
 import { getOrderDetail, closeCom, overOrder, getWarehouseList, deliverOrder, directOrder, getPositionList } from "@/api/supply/engin";
+import CheckOrder from "@/components/Common/check-order";
 
 export default {
   name: 'CommerceDetail',
   componentName: 'CommerceDetail',
+  components: {
+    CheckOrder,
+  },
   props: ['listItem'],
   filters: {
     statusFilter(val) {
@@ -401,6 +412,9 @@ export default {
       positionList1: [],
       positionList2: [],
       directGoodsList: [],
+
+      checkOrderId: {},
+      isShowCheckOrder: false,
     }
   },
 
@@ -616,6 +630,16 @@ export default {
       })
     },
 
+    // 联查单据
+    toCheckOrder() {
+      this.checkOrderId = this.detailData.enginOrderId;
+      this.isShowCheckOrder = true;
+    },
+
+    backDetail() {
+      this.isShowCheckOrder = false;
+    },
+
   }
 }
 </script>

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

@@ -6,7 +6,7 @@
       <div class="title">工程信息单</div>
     </div>
 
-    <el-form ref="mainForm" :model="mainForm" :rules="mainFormRules" label-width="100px" size="small" label-position="right">
+    <el-form ref="mainForm" :model="mainForm" :rules="mainFormRules" label-width="110px" size="small" label-position="right">
       <el-row :gutter="20">
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="工程信息单" prop="orderNum">
@@ -248,6 +248,7 @@ export default {
         jxsName: [{ required: true, message: '请输入经销商名称', trigger: 'blur' }],
         company: [{ required: true, message: '请输入使用单位', trigger: 'blur' }],
         address: [{ required: true, message: '请输入安装地址', trigger: 'blur' }],
+        loginType: [{ required: true, message: '请输入工程登录类型', trigger: 'blur' }],
       },
 
       typeList: [],

src/views/supply/engin/components/home_detail.vue

@@ -1,205 +1,210 @@
 <template>
   <div class="detail-container">
-    <el-page-header @back="goBack" content="详情"></el-page-header>
 
-    <div id="printData">
-      <div class="main-title">
-        <div class="title">工程订单</div>
-      </div>
+    <div v-show="!isShowCheckOrder">
+
+      <el-page-header @back="goBack" content="详情"></el-page-header>
+
+      <div id="printData">
+        <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.enginOrderNo}}</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.customerNumber}}</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.confirmName}}</div>
+            </el-col>
+            <el-col :span="6" class="item">
+              <div class="label">审核日期</div>
+              <div class="value">{{detailData.confirmTime}}</div>
+            </el-col>
+            <el-col :span="6" class="item">
+              <div class="label">最后更新人</div>
+              <div class="value">{{detailData.updateName}}</div>
+            </el-col>
+            <el-col :span="6" class="item">
+              <div class="label">最后更新日期</div>
+              <div class="value">{{detailData.updateTime}}</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-col :span="24" class="item">
+              <div class="label">审批说明</div>
+              <div class="value">{{detailData.examineNote}}</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"
+            show-summary
+            :summary-method="$getSummaries">
+            <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="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.price | numToFixed }}
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="工程登录数量" prop="enginNum" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="数量" prop="number" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="订单金额" prop="totalAmount" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.totalAmount | numToFixed }}
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="返利类型" prop="customerWalletName2" min-width="140" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="使用返利金额" prop="payRebateAmount" min-width="120" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.payRebateAmount | numToFixed }}
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="格力折扣" prop="discAmount" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.payRebateAmount | numToFixed }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="现金钱包" prop="customerWalletName" min-width="140" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="实付金额" prop="payAmount" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.payAmount | numToFixed }}
+              </template>
+            </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="right" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="原订单数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="税率" prop="tax" min-width="100" show-overflow-tooltip></el-table-column>
+          </el-table>
+        </div>
 
-      <div class="diy-table-1">
-        <el-row>
-          <el-col :span="8" class="item">
-            <div class="label">工程订单号</div>
-            <div class="value">{{detailData.enginOrderNo}}</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.customerNumber}}</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.confirmName}}</div>
-          </el-col>
-          <el-col :span="6" class="item">
-            <div class="label">审核日期</div>
-            <div class="value">{{detailData.confirmTime}}</div>
-          </el-col>
-          <el-col :span="6" class="item">
-            <div class="label">最后更新人</div>
-            <div class="value">{{detailData.updateName}}</div>
-          </el-col>
-          <el-col :span="6" class="item">
-            <div class="label">最后更新日期</div>
-            <div class="value">{{detailData.updateTime}}</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-col :span="24" class="item">
-            <div class="label">审批说明</div>
-            <div class="value">{{detailData.examineNote}}</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"
-          show-summary
-          :summary-method="$getSummaries">
-          <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="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.price | numToFixed }}
-            </template>
-          </el-table-column>
-          <el-table-column align="right" label="工程登录数量" prop="enginNum" min-width="120" show-overflow-tooltip></el-table-column>
-          <el-table-column align="right" label="数量" prop="number" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="right" label="订单金额" prop="totalAmount" min-width="100" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.totalAmount | numToFixed }}
-            </template>
-          </el-table-column>
-          <el-table-column align="right" label="返利类型" prop="customerWalletName2" min-width="140" show-overflow-tooltip></el-table-column>
-          <el-table-column align="right" label="使用返利金额" prop="payRebateAmount" min-width="120" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.payRebateAmount | numToFixed }}
-            </template>
-          </el-table-column>
-          <el-table-column align="right" label="格力折扣" prop="discAmount" min-width="100" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.payRebateAmount | numToFixed }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="现金钱包" prop="customerWalletName" min-width="140" show-overflow-tooltip></el-table-column>
-          <el-table-column align="right" label="实付金额" prop="payAmount" min-width="100" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.payAmount | numToFixed }}
-            </template>
-          </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="right" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="right" label="原订单数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="税率" prop="tax" min-width="100" show-overflow-tooltip></el-table-column>
-        </el-table>
-      </div>
-
-    </div>
-
-    <div class="page-footer">
-      <div class="footer">
-        <el-button type="danger" @click="closeData" v-if="detailData.examineStatus === 'SAVE' || detailData.examineStatus === 'WAIT'">关闭订单</el-button>
-        <el-button type="primary" @click="openDirectDialog">提前开票</el-button>
-        <el-button type="primary" @click="overData">直调完结</el-button>
-        <el-button type="primary" @click="openDeliverDialog" :disabled="detailData.directTransferStatus">直调发货</el-button>
-        <el-button @click="goBack">返回</el-button>
+      <div class="page-footer">
+        <div class="footer">
+          <el-button type="success" @click="toCheckOrder">联查单据</el-button>
+          <el-button type="danger" @click="closeData" v-if="detailData.examineStatus === 'SAVE' || detailData.examineStatus === 'WAIT'">关闭订单</el-button>
+          <el-button type="primary" @click="openDirectDialog">提前开票</el-button>
+          <el-button type="primary" @click="overData">直调完结</el-button>
+          <el-button type="primary" @click="openDeliverDialog" :disabled="detailData.directTransferStatus">直调发货</el-button>
+          <el-button @click="goBack">返回</el-button>
+        </div>
       </div>
     </div>
 
@@ -254,7 +259,6 @@
       </span>
     </el-dialog>
 
-
     <el-dialog title="直接调拨单（提前开票）" :visible.sync="isShowDirectDialog" width="80%">
       <el-form ref="directForm" :model="directForm" :rules="directFormRules" label-width="80px" size="small" label-position="left">
         <el-row :gutter="20">
@@ -320,15 +324,21 @@
       </span>
     </el-dialog>
 
+    <CheckOrder :checkOrderId="checkOrderId" v-if="isShowCheckOrder" @backDetail="backDetail" />
+
   </div>
 </template>
 
 <script>
 import { getOrderDetail, closeHome, overOrder, getWarehouseList, deliverOrder, directOrder, getPositionList } from "@/api/supply/engin";
+import CheckOrder from "@/components/Common/check-order";
 
 export default {
   name: 'HomeDetail',
   componentName: 'HomeDetail',
+  components: {
+    CheckOrder,
+  },
   props: ['listItem'],
   filters: {
     statusFilter(val) {
@@ -391,6 +401,9 @@ export default {
       directGoodsList: [],
 
       formLoading: false,
+
+      checkOrderId: {},
+      isShowCheckOrder: false,
     }
   },
 
@@ -612,6 +625,16 @@ export default {
       })
     },
 
+    // 联查单据
+    toCheckOrder() {
+      this.checkOrderId = this.detailData.enginOrderId;
+      this.isShowCheckOrder = true;
+    },
+
+    backDetail() {
+      this.isShowCheckOrder = false;
+    },
+
   }
 }
 </script>

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

@@ -1,156 +1,160 @@
 <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="progress-container">
-      <el-progress :text-inside="true" :stroke-width="26" :percentage="detailData.thjd ? (detailData.thjd * 1000 / 10) : 0"></el-progress>
-    </div>
-
-    <div class="main-title">
-      <div class="title">订单信息</div>
-    </div>
-
-    <div class="diy-table-1">
-      <el-row>
-        <el-col :span="8" class="item">
-          <div class="label">订单号</div>
-          <div class="value">{{detailData.id}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">订单日期</div>
-          <div class="value">{{detailData.theTime | dateToDayFilter}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">单据状态</div>
-          <div class="value">{{detailData.examineStatus | statusFilter}}</div>
-        </el-col>
-        <el-col :span="16" class="item">
-          <div class="label">备注</div>
-          <div class="value">{{detailData.remark}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">业务员</div>
-          <div class="value">{{detailData.serviceName}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">制单人</div>
-          <div class="value">{{detailData.createName}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">制单日期</div>
-          <div class="value">{{detailData.createTime}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">审核人</div>
-          <div class="value">{{detailData.examineName}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">审核日期</div>
-          <div class="value">{{detailData.examineTime}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">关闭人</div>
-          <div class="value">{{detailData.closeName}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">关闭日期</div>
-          <div class="value">{{detailData.closeTime}}</div>
-        </el-col>
-      </el-row>
-    </div>
+    <div v-show="!isShowCheckOrder">
+      <el-page-header @back="goBack" content="详情"></el-page-header>
 
-    <div class="main-title">
-      <div class="title">货品信息</div>
-    </div>
-
-    <div class="table" style="margin-top: 20px">
-      <el-table
-        :data="detailData.retailOrderItemList"
-        element-loading-text="Loading"
-        border
-        fit
-        highlight-current-row
-        stripe
-        max-height="400"
-        show-summary
-        :summary-method="$getSummaries">
-        <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
-        <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="产品编码" prop="materialCode" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.price | numToFixed }}
-          </template>
-        </el-table-column>
-        <el-table-column align="right" label="数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="right" label="订单金额" prop="totalAmount" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.totalAmount | numToFixed }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="返利类型" prop="customerWalletName2" min-width="140" show-overflow-tooltip></el-table-column>
-        <el-table-column align="right" label="返利金额" prop="payRebateAmount" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.payRebateAmount | numToFixed }}
-          </template>
-        </el-table-column>
-        <el-table-column align="right" label="格力折扣" prop="totalDiscAmount" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.totalDiscAmount | numToFixed }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="现金钱包" prop="customerWalletName" min-width="140" show-overflow-tooltip></el-table-column>
-        <el-table-column align="right" label="实付金额" prop="payAmount" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.payAmount | numToFixed }}
-          </template>
-        </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="right" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="right" label="原订单数量" prop="oldQty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="税率" prop="tax" min-width="100" show-overflow-tooltip></el-table-column>
-      </el-table>
-    </div>
+      <div class="main-title">
+        <div class="title">提货进度</div>
+      </div>
+      <div class="progress-container">
+        <el-progress :text-inside="true" :stroke-width="26" :percentage="detailData.thjd ? (detailData.thjd * 1000 / 10) : 0"></el-progress>
+      </div>
 
-    <div v-if="isExamine">
       <div class="main-title">
-        <div class="title">审批记录</div>
+        <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">{{detailData.examineName}}</div>
+        <el-row>
+          <el-col :span="8" class="item">
+            <div class="label">订单号</div>
+            <div class="value">{{detailData.id}}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">订单日期</div>
+            <div class="value">{{detailData.theTime | dateToDayFilter}}</div>
           </el-col>
-          <el-col :span="12" class="item">
-            <div class="label">审批结果</div>
+          <el-col :span="8" class="item">
+            <div class="label">单据状态</div>
             <div class="value">{{detailData.examineStatus | statusFilter}}</div>
           </el-col>
-          <el-col :span="24" class="item">
-            <div class="label">审批说明</div>
-            <div class="value">{{detailData.examineRemark}}</div>
+          <el-col :span="16" class="item">
+            <div class="label">备注</div>
+            <div class="value">{{detailData.remark}}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">业务员</div>
+            <div class="value">{{detailData.serviceName}}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">制单人</div>
+            <div class="value">{{detailData.createName}}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">制单日期</div>
+            <div class="value">{{detailData.createTime}}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">审核人</div>
+            <div class="value">{{detailData.examineName}}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">审核日期</div>
+            <div class="value">{{detailData.examineTime}}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">关闭人</div>
+            <div class="value">{{detailData.closeName}}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">关闭日期</div>
+            <div class="value">{{detailData.closeTime}}</div>
           </el-col>
         </el-row>
       </div>
-    </div>
 
-    <div class="page-footer">
-      <div class="footer" :class="classObj">
-        <el-button type="primary" @click="openDirectDialog" :disabled="detailData.examineStatus !== 'OK'">提前开票</el-button>
-        <el-button type="primary" @click="openDeliverDialog" :disabled="detailData.examineStatus !== 'OK' || detailData.directTransferStatus === true">直调发货</el-button>
-        <el-button type="primary" @click="handleFinish" :disabled="detailData.examineStatus !== 'OK'">直调完成</el-button>
-        <el-button @click="goBack">关 闭</el-button>
+      <div class="main-title">
+        <div class="title">货品信息</div>
+      </div>
+
+      <div class="table" style="margin-top: 20px">
+        <el-table
+          :data="detailData.retailOrderItemList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+          max-height="400"
+          show-summary
+          :summary-method="$getSummaries">
+          <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
+          <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="产品编码" prop="materialCode" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ scope.row.price | numToFixed }}
+            </template>
+          </el-table-column>
+          <el-table-column align="right" label="数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="right" label="订单金额" prop="totalAmount" min-width="100" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ scope.row.totalAmount | numToFixed }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="返利类型" prop="customerWalletName2" min-width="140" show-overflow-tooltip></el-table-column>
+          <el-table-column align="right" label="返利金额" prop="payRebateAmount" min-width="100" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ scope.row.payRebateAmount | numToFixed }}
+            </template>
+          </el-table-column>
+          <el-table-column align="right" label="格力折扣" prop="totalDiscAmount" min-width="100" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ scope.row.totalDiscAmount | numToFixed }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="现金钱包" prop="customerWalletName" min-width="140" show-overflow-tooltip></el-table-column>
+          <el-table-column align="right" label="实付金额" prop="payAmount" min-width="100" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ scope.row.payAmount | numToFixed }}
+            </template>
+          </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="right" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="right" label="原订单数量" prop="oldQty" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="税率" prop="tax" min-width="100" show-overflow-tooltip></el-table-column>
+        </el-table>
+      </div>
+
+      <div v-if="isExamine">
+        <div class="main-title">
+          <div class="title">审批记录</div>
+        </div>
+        <div class="diy-table-1">
+          <el-row :gutter="0">
+            <el-col :span="12" class="item">
+              <div class="label">审批人</div>
+              <div class="value">{{detailData.examineName}}</div>
+            </el-col>
+            <el-col :span="12" class="item">
+              <div class="label">审批结果</div>
+              <div class="value">{{detailData.examineStatus | statusFilter}}</div>
+            </el-col>
+            <el-col :span="24" class="item">
+              <div class="label">审批说明</div>
+              <div class="value">{{detailData.examineRemark}}</div>
+            </el-col>
+          </el-row>
+        </div>
+      </div>
+
+      <div class="page-footer">
+        <div class="footer">
+          <el-button type="success" @click="toCheckOrder">联查单据</el-button>
+          <el-button type="primary" @click="openDirectDialog" :disabled="detailData.examineStatus !== 'OK'">提前开票</el-button>
+          <el-button type="primary" @click="openDeliverDialog" :disabled="detailData.examineStatus !== 'OK' || detailData.directTransferStatus === true">直调发货</el-button>
+          <el-button type="primary" @click="handleFinish" :disabled="detailData.examineStatus !== 'OK'" v-if="isDealer">直调完成</el-button>
+          <el-button @click="goBack">关 闭</el-button>
+        </div>
       </div>
     </div>
 
@@ -287,15 +291,21 @@
       </span>
     </el-dialog>
 
+    <CheckOrder :checkOrderId="checkOrderId" v-if="isShowCheckOrder" @backDetail="backDetail" />
+
   </div>
 </template>
 
 <script>
 import { getDetail, getWarehouseList, adjustDeliver, finishData, directOrder, getPositionList } from "@/api/supply/retail";
+import CheckOrder from "@/components/Common/check-order";
 
 export default {
   name: 'RetailDetail',
   componentName: 'RetailDetail',
+  components: {
+    CheckOrder,
+  },
   props: ['listItem'],
   filters: {
     statusFilter(val) {
@@ -356,22 +366,19 @@ export default {
       positionList1: [],
       positionList2: [],
       directGoodsList: [],
+
+      checkOrderId: {},
+      isShowCheckOrder: false,
     }
   },
 
   computed: {
-    sidebar() {
-      return this.$store.state.app.sidebar
-    },
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened
-      }
-    },
     isExamine() {
       return this.detailData.examineStatus === 'OK' || this.detailData.examineStatus === 'FAIL'
     },
+    isDealer() {
+      return JSON.parse(localStorage.getItem("supply_user")).isCustomer
+    },
   },
 
   created() {
@@ -557,6 +564,16 @@ export default {
       })
     },
 
+    // 联查单据
+    toCheckOrder() {
+      this.checkOrderId = this.detailData.id;
+      this.isShowCheckOrder = true;
+    },
+
+    backDetail() {
+      this.isShowCheckOrder = false;
+    },
+
   }
 }
 </script>