|
|
@@ -3,7 +3,7 @@
|
|
|
|
|
|
<div v-show="!isShowCheckOrder">
|
|
|
|
|
|
- <el-page-header @back="goBack" content="详情"></el-page-header>
|
|
|
+ <el-page-header content="详情" @back="goBack" />
|
|
|
|
|
|
<div id="printData">
|
|
|
<div class="main-title">
|
|
|
@@ -14,139 +14,149 @@
|
|
|
<el-row>
|
|
|
<el-col :span="8" class="item">
|
|
|
<div class="label">工程订单号</div>
|
|
|
- <div class="value">{{detailData.enginOrderNo}}</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>
|
|
|
+ <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>
|
|
|
+ <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>
|
|
|
+ <div class="value">{{ detailData.customerNumber }}</div>
|
|
|
</el-col>
|
|
|
<el-col :span="8" class="item">
|
|
|
<div class="label">经销商名称</div>
|
|
|
- <div class="value">{{detailData.customerName}}</div>
|
|
|
+ <div class="value">{{ detailData.customerName }}</div>
|
|
|
</el-col>
|
|
|
<el-col :span="8" class="item">
|
|
|
<div class="label">机型类别</div>
|
|
|
- <div class="value">{{detailData.refMachineType}}</div>
|
|
|
+ <div class="value">{{ detailData.refMachineType }}</div>
|
|
|
</el-col>
|
|
|
<el-col :span="8" class="item">
|
|
|
<div class="label">工程登录编号</div>
|
|
|
- <div class="value">{{detailData.refEnginRecordNo}}</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>
|
|
|
+ <div class="value">{{ detailData.refProjectName }}</div>
|
|
|
</el-col>
|
|
|
<el-col :span="8" class="item">
|
|
|
<div class="label">行业类别</div>
|
|
|
- <div class="value">{{detailData.refTradeCategory}}</div>
|
|
|
+ <div class="value">{{ detailData.refTradeCategory }}</div>
|
|
|
</el-col>
|
|
|
- <el-col :span="8" class="item">
|
|
|
+ <el-col :span="8" class="item">
|
|
|
<div class="label">工程编号</div>
|
|
|
- <div class="value">{{detailData.refProjectNo}}</div>
|
|
|
+ <div class="value">{{ detailData.refProjectNo }}</div>
|
|
|
</el-col>
|
|
|
<el-col :span="8" class="item">
|
|
|
<div class="label">跨区厂编号</div>
|
|
|
- <div class="value">{{detailData.refFactoryNo}}</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>
|
|
|
+ <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.saleTypeName}}</div>-->
|
|
|
+ <!-- </el-col>-->
|
|
|
<el-col :span="8" class="item">
|
|
|
<div class="label">联系人</div>
|
|
|
- <div class="value">{{detailData.refLinkman}}</div>
|
|
|
+ <div class="value">{{ detailData.refLinkman }}</div>
|
|
|
</el-col>
|
|
|
<el-col :span="8" class="item">
|
|
|
<div class="label">固定电话</div>
|
|
|
- <div class="value">{{detailData.refTel}}</div>
|
|
|
+ <div class="value">{{ detailData.refTel }}</div>
|
|
|
</el-col>
|
|
|
<el-col :span="8" class="item">
|
|
|
<div class="label">移动电话</div>
|
|
|
- <div class="value">{{detailData.refPhone}}</div>
|
|
|
+ <div class="value">{{ detailData.refPhone }}</div>
|
|
|
</el-col>
|
|
|
<el-col v-if="!isDealer" :span="8" class="item">
|
|
|
<div class="label">权限分类</div>
|
|
|
- <div class="value">{{detailData.refPowerCategory}}</div>
|
|
|
+ <div class="value">{{ detailData.refPowerCategory }}</div>
|
|
|
</el-col>
|
|
|
<el-col :span="8" class="item">
|
|
|
<div class="label">工程登录类型</div>
|
|
|
- <div class="value">{{detailData.refPromiseStatus}}</div>
|
|
|
+ <div class="value">{{ detailData.refPromiseStatus }}</div>
|
|
|
</el-col>
|
|
|
<el-col :span="24" class="item">
|
|
|
<div class="label">安装地址</div>
|
|
|
- <div class="value">{{detailData.refInstallAddress}}</div>
|
|
|
+ <div class="value">{{ detailData.refInstallAddress }}</div>
|
|
|
</el-col>
|
|
|
<el-col :span="8" class="item">
|
|
|
<div class="label">不扣押金</div>
|
|
|
- <div class="value">{{detailData.takeDeposit ? '是':'否'}}</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>
|
|
|
+ <div class="value">{{ detailData.fileNo }}</div>
|
|
|
</el-col>
|
|
|
<el-col :span="8" class="item">
|
|
|
<div class="label">业务员</div>
|
|
|
- <div class="value">{{detailData.serviceName}}</div>
|
|
|
+ <div class="value">{{ detailData.serviceName }}</div>
|
|
|
</el-col>
|
|
|
<el-col :span="24" class="item">
|
|
|
<div class="label">格力回复</div>
|
|
|
- <div class="value">{{detailData.geLiNote}}</div>
|
|
|
+ <div class="value">{{ detailData.geLiNote }}</div>
|
|
|
</el-col>
|
|
|
<el-col v-if="!isDealer" :span="24" class="item">
|
|
|
<div class="label">格力内部备注</div>
|
|
|
- <div class="value">{{detailData.geLiInerNote}}</div>
|
|
|
+ <div class="value">{{ detailData.geLiInerNote }}</div>
|
|
|
</el-col>
|
|
|
<el-col :span="24" class="item">
|
|
|
<div class="label">备注</div>
|
|
|
- <div class="value">{{detailData.remark}}</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>
|
|
|
+ <div class="value">{{ detailData.createName }}</div>
|
|
|
</el-col>
|
|
|
<el-col :span="6" class="item">
|
|
|
<div class="label">制单日期</div>
|
|
|
- <div class="value">{{detailData.createTime}}</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>
|
|
|
+ <div class="value">{{ detailData.confirmName }}</div>
|
|
|
</el-col>
|
|
|
<el-col :span="6" class="item">
|
|
|
<div class="label">审核日期</div>
|
|
|
- <div class="value">{{detailData.confirmTime}}</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>
|
|
|
+ <div class="value">{{ detailData.updateName }}</div>
|
|
|
</el-col>
|
|
|
<el-col :span="6" class="item">
|
|
|
<div class="label">最后更新日期</div>
|
|
|
- <div class="value">{{detailData.updateTime}}</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>
|
|
|
+ <div class="value">{{ detailData.closeName }}</div>
|
|
|
</el-col>
|
|
|
<el-col :span="6" class="item">
|
|
|
<div class="label">关闭日期</div>
|
|
|
- <div class="value">{{detailData.closeTime}}</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>
|
|
|
+ <div class="value">{{ detailData.examineNote }}</div>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="24" class="item">
|
|
|
+ <div class="label">计划单</div>
|
|
|
+ <div class="value">
|
|
|
+ <el-checkbox v-model="detailData.isPlanOrder" disabled true-label="true" false-label="false">
|
|
|
+ {{ detailData.isPlanOrder=='true'?'是':'否' }}
|
|
|
+ </el-checkbox>
|
|
|
+
|
|
|
+ </div>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</div>
|
|
|
@@ -165,27 +175,28 @@
|
|
|
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="left" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
|
|
|
- <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="120" show-overflow-tooltip></el-table-column>
|
|
|
- <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
|
|
|
- <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
|
|
|
- <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip></el-table-column>
|
|
|
- <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
|
|
|
+ :summary-method="$getSummaries"
|
|
|
+ >
|
|
|
+ <el-table-column align="center" label="序号" type="index" width="50" />
|
|
|
+ <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip />
|
|
|
+ <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="120" show-overflow-tooltip />
|
|
|
+ <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip />
|
|
|
+ <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip />
|
|
|
+ <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip />
|
|
|
+ <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip />
|
|
|
<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="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="right" label="工程登录数量" prop="enginNum" min-width="100" show-overflow-tooltip />
|
|
|
+ <el-table-column align="right" label="数量" prop="qty" min-width="100" show-overflow-tooltip />
|
|
|
<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="left" label="返利类型" prop="customerWalletName2" min-width="100" show-overflow-tooltip></el-table-column>
|
|
|
+ <el-table-column align="left" label="返利类型" prop="customerWalletName2" min-width="100" show-overflow-tooltip />
|
|
|
<el-table-column align="right" label="实付返利金额" prop="payRebateAmount" min-width="100" show-overflow-tooltip>
|
|
|
<template slot-scope="scope">
|
|
|
{{ scope.row.payRebateAmount | numToFixed }}
|
|
|
@@ -196,7 +207,7 @@
|
|
|
{{ scope.row.discAmount | numToFixed }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="left" label="现金钱包" prop="customerWalletName" min-width="100" show-overflow-tooltip></el-table-column>
|
|
|
+ <el-table-column align="left" label="现金钱包" prop="customerWalletName" min-width="100" show-overflow-tooltip />
|
|
|
<el-table-column align="right" label="实付金额" prop="payAmount" min-width="100" show-overflow-tooltip>
|
|
|
<template slot-scope="scope">
|
|
|
{{ scope.row.payAmount | numToFixed }}
|
|
|
@@ -207,11 +218,11 @@
|
|
|
{{ 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="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
|
|
|
- <el-table-column align="left" label="税率" prop="tax" min-width="100" show-overflow-tooltip></el-table-column>
|
|
|
- <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
|
|
|
+ <el-table-column align="right" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip />
|
|
|
+ <el-table-column align="right" label="原订单数量" prop="oldQty" min-width="100" show-overflow-tooltip />
|
|
|
+ <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip />
|
|
|
+ <el-table-column align="left" label="税率" prop="tax" min-width="100" show-overflow-tooltip />
|
|
|
+ <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip />
|
|
|
</el-table>
|
|
|
</div>
|
|
|
|
|
|
@@ -220,10 +231,10 @@
|
|
|
<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 v-if="detailData.examineStatus === 'SAVE' || detailData.examineStatus === 'WAIT'" type="danger" @click="closeData">关闭订单</el-button>
|
|
|
<!-- <el-button type="primary" @click="openDirectDialog" v-if="!isDealer">提前开票</el-button> -->
|
|
|
- <el-button type="primary" @click="overData" v-if="!isDealer">直调完结</el-button>
|
|
|
- <el-button type="primary" @click="openDeliverDialog" :disabled="detailData.directTransferStatus" v-if="!isDealer">直调发货</el-button>
|
|
|
+ <el-button v-if="!isDealer" type="primary" @click="overData">直调完结</el-button>
|
|
|
+ <el-button v-if="!isDealer" type="primary" :disabled="detailData.directTransferStatus" @click="openDeliverDialog">直调发货</el-button>
|
|
|
<el-button @click="goBack">返回列表</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -239,20 +250,20 @@
|
|
|
type="date"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
style="width: 100%;"
|
|
|
- placeholder="选择日期">
|
|
|
- </el-date-picker>
|
|
|
+ placeholder="选择日期"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="8" :sm="8" :lg="8">
|
|
|
<el-form-item label="选择仓位" prop="position">
|
|
|
<el-select v-model="deliverForm.position" placeholder="请选择仓位" style="width: 100%" filterable>
|
|
|
- <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id"></el-option>
|
|
|
+ <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="8" :sm="8" :lg="8">
|
|
|
<el-form-item label="发货申请备注" prop="remark">
|
|
|
- <el-input v-model="deliverForm.remark" placeholder="请输入发货申请备注" clearable ></el-input>
|
|
|
+ <el-input v-model="deliverForm.remark" placeholder="请输入发货申请备注" clearable />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -260,17 +271,17 @@
|
|
|
|
|
|
<div class="table" style="margin-top: 20px">
|
|
|
<el-table :data="deliverGoodsList" 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="100" 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="unit" 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="right" label="发货数量" prop="hasSendQty" min-width="100" show-overflow-tooltip></el-table-column>
|
|
|
+ <el-table-column align="center" label="序号" type="index" width="50" />
|
|
|
+ <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip />
|
|
|
+ <el-table-column align="center" label="物料编码" prop="materialNumber" min-width="160" show-overflow-tooltip />
|
|
|
+ <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip />
|
|
|
+ <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip />
|
|
|
+ <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip />
|
|
|
+ <el-table-column align="right" label="订单数量" prop="qty" min-width="100" show-overflow-tooltip />
|
|
|
+ <el-table-column align="right" label="发货数量" prop="hasSendQty" min-width="100" show-overflow-tooltip />
|
|
|
<el-table-column align="right" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip>
|
|
|
<template slot-scope="scope">
|
|
|
- <el-input v-model="scope.row.realDirectTransferQty" size="small" type="number" @mousewheel.native.prevent></el-input>
|
|
|
+ <el-input v-model="scope.row.realDirectTransferQty" size="small" type="number" @mousewheel.native.prevent />
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
|
|
|
@@ -288,7 +299,7 @@
|
|
|
{{ scope.row.payRebateAmount | numToFixed }}
|
|
|
</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="remark" min-width="160" show-overflow-tooltip />
|
|
|
</el-table>
|
|
|
</div>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
@@ -297,35 +308,34 @@
|
|
|
</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">
|
|
|
<el-col :xs="12" :sm="6" :lg="6">
|
|
|
<el-form-item label="调出仓库" prop="warehouse1">
|
|
|
<el-select v-model="directForm.warehouse1" placeholder="请选择调出仓库" style="width: 100%" filterable @change="changeWarehouse1">
|
|
|
- <el-option v-for="item in warehouseList1" :key="item.id" :label="item.name" :value="item.id"></el-option>
|
|
|
+ <el-option v-for="item in warehouseList1" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="12" :sm="6" :lg="6">
|
|
|
<el-form-item label="调出仓位" prop="position1">
|
|
|
<el-select v-model="directForm.position1" placeholder="请调出仓位" style="width: 100%" filterable @change="changePosition1">
|
|
|
- <el-option v-for="item in positionList1" :key="item.id" :label="item.name" :value="item.id"></el-option>
|
|
|
+ <el-option v-for="item in positionList1" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="12" :sm="6" :lg="6">
|
|
|
<el-form-item label="调入仓库" prop="warehouse2">
|
|
|
<el-select v-model="directForm.warehouse2" placeholder="请选择调入仓库" style="width: 100%" filterable @change="changeWarehouse2">
|
|
|
- <el-option v-for="item in warehouseList2" :key="item.id" :label="item.name" :value="item.id"></el-option>
|
|
|
+ <el-option v-for="item in warehouseList2" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="12" :sm="6" :lg="6">
|
|
|
<el-form-item label="调入仓位" prop="position2">
|
|
|
<el-select v-model="directForm.position2" placeholder="请调入仓位" style="width: 100%" filterable @change="changePosition2">
|
|
|
- <el-option v-for="item in positionList2" :key="item.id" :label="item.name" :value="item.id"></el-option>
|
|
|
+ <el-option v-for="item in positionList2" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -334,27 +344,27 @@
|
|
|
|
|
|
<div class="table" style="margin-top: 20px">
|
|
|
<el-table :data="directGoodsList" 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="100" 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="center" label="数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
|
|
|
- <el-table-column align="center" label="调出仓库" prop="warehouse1" min-width="100" show-overflow-tooltip></el-table-column>
|
|
|
- <el-table-column align="center" label="调出仓位" prop="position1" min-width="100" show-overflow-tooltip></el-table-column>
|
|
|
- <el-table-column align="center" label="调入仓库" prop="warehouse2" min-width="100" show-overflow-tooltip></el-table-column>
|
|
|
- <el-table-column align="center" label="调入仓位" prop="position2" min-width="100" show-overflow-tooltip></el-table-column>
|
|
|
- <el-table-column align="center" label="调出库存状态" prop="status1" min-width="110" show-overflow-tooltip></el-table-column>
|
|
|
- <el-table-column align="center" label="调入库存状态" prop="status2" min-width="110" show-overflow-tooltip></el-table-column>
|
|
|
+ <el-table-column align="center" label="序号" type="index" width="50" />
|
|
|
+ <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip />
|
|
|
+ <el-table-column align="center" label="产品编码" prop="materialNumber" min-width="160" show-overflow-tooltip />
|
|
|
+ <el-table-column align="center" label="物料代码" prop="materialOldNumber" min-width="160" show-overflow-tooltip />
|
|
|
+ <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip />
|
|
|
+ <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip />
|
|
|
+ <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip />
|
|
|
+ <el-table-column align="center" label="数量" prop="qty" min-width="100" show-overflow-tooltip />
|
|
|
+ <el-table-column align="center" label="调出仓库" prop="warehouse1" min-width="100" show-overflow-tooltip />
|
|
|
+ <el-table-column align="center" label="调出仓位" prop="position1" min-width="100" show-overflow-tooltip />
|
|
|
+ <el-table-column align="center" label="调入仓库" prop="warehouse2" min-width="100" show-overflow-tooltip />
|
|
|
+ <el-table-column align="center" label="调入仓位" prop="position2" min-width="100" show-overflow-tooltip />
|
|
|
+ <el-table-column align="center" label="调出库存状态" prop="status1" min-width="110" show-overflow-tooltip />
|
|
|
+ <el-table-column align="center" label="调入库存状态" prop="status2" min-width="110" show-overflow-tooltip />
|
|
|
<el-table-column align="center" label="调出货主" min-width="100" show-overflow-tooltip>
|
|
|
<template slot-scope="">弘格</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column align="center" label="调入货主" min-width="100" show-overflow-tooltip>
|
|
|
<template slot-="scope">弘格</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="remark" min-width="160" show-overflow-tooltip />
|
|
|
</el-table>
|
|
|
</div>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
@@ -363,35 +373,35 @@
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
|
|
|
- <CheckOrder :checkOrderId="checkOrderId" v-if="isShowCheckOrder" @backDetail="backDetail" />
|
|
|
+ <CheckOrder v-if="isShowCheckOrder" :check-order-id="checkOrderId" @backDetail="backDetail" />
|
|
|
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { getOrderDetail, closeCom, overOrder, getWarehouseList, deliverOrder, directOrder, getPositionList } from "@/api/supply/engin";
|
|
|
-import CheckOrder from "@/components/Common/check-order";
|
|
|
+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,
|
|
|
+ CheckOrder
|
|
|
},
|
|
|
- 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);
|
|
|
+ // { label: '审核驳回', value: 'FAIL' },,
|
|
|
+ { label: '已关闭', value: 'CLOSE' }
|
|
|
+ ]
|
|
|
+ const obj = statusList.find(o => o.value == val)
|
|
|
return obj ? obj.label : ''
|
|
|
}
|
|
|
},
|
|
|
+ props: ['listItem'],
|
|
|
data() {
|
|
|
return {
|
|
|
detailData: {},
|
|
|
@@ -400,7 +410,7 @@ export default {
|
|
|
deliverForm: {
|
|
|
date: '',
|
|
|
position: '',
|
|
|
- remark:''
|
|
|
+ remark: ''
|
|
|
},
|
|
|
deliverFormRules: {
|
|
|
date: [
|
|
|
@@ -408,7 +418,7 @@ export default {
|
|
|
],
|
|
|
position: [
|
|
|
{ required: true, message: '请选择仓位', trigger: 'change' }
|
|
|
- ],
|
|
|
+ ]
|
|
|
},
|
|
|
positionList: [],
|
|
|
deliverGoodsList: [],
|
|
|
@@ -418,7 +428,7 @@ export default {
|
|
|
warehouse1: '',
|
|
|
position1: '',
|
|
|
warehouse2: '',
|
|
|
- position2: '',
|
|
|
+ position2: ''
|
|
|
},
|
|
|
directFormRules: {
|
|
|
warehouse1: [
|
|
|
@@ -432,7 +442,7 @@ export default {
|
|
|
],
|
|
|
position2: [
|
|
|
{ required: true, message: '请选择调入仓位', trigger: 'change' }
|
|
|
- ],
|
|
|
+ ]
|
|
|
},
|
|
|
warehouseList1: [],
|
|
|
warehouseList2: [],
|
|
|
@@ -441,7 +451,7 @@ export default {
|
|
|
directGoodsList: [],
|
|
|
|
|
|
checkOrderId: {},
|
|
|
- isShowCheckOrder: false,
|
|
|
+ isShowCheckOrder: false
|
|
|
}
|
|
|
},
|
|
|
|
|
|
@@ -450,28 +460,28 @@ export default {
|
|
|
return this.detailData.examineStatus === 'OK' || this.detailData.examineStatus === 'FAIL'
|
|
|
},
|
|
|
isDealer() {
|
|
|
- return JSON.parse(localStorage.getItem("supply_user")).isCustomer
|
|
|
- },
|
|
|
+ return JSON.parse(localStorage.getItem('supply_user')).isCustomer
|
|
|
+ }
|
|
|
},
|
|
|
|
|
|
created() {
|
|
|
- this.getDetail();
|
|
|
+ this.getDetail()
|
|
|
},
|
|
|
|
|
|
methods: {
|
|
|
// 返回列表
|
|
|
goBack() {
|
|
|
- this.$emit('backListFormDetail');
|
|
|
+ this.$emit('backListFormDetail')
|
|
|
},
|
|
|
|
|
|
// 获取仓库列表
|
|
|
getWarehouseList() {
|
|
|
getWarehouseList({
|
|
|
pageNum: 1,
|
|
|
- pageSize: -1,
|
|
|
+ pageSize: -1
|
|
|
}).then(res => {
|
|
|
- this.warehouseList1 = res.data.records;
|
|
|
- this.warehouseList2 = res.data.records;
|
|
|
+ this.warehouseList1 = res.data.records
|
|
|
+ this.warehouseList2 = res.data.records
|
|
|
})
|
|
|
},
|
|
|
|
|
|
@@ -482,21 +492,21 @@ export default {
|
|
|
pageSize: -1,
|
|
|
type: 2
|
|
|
}).then(res => {
|
|
|
- this.positionList = res.data.records;
|
|
|
+ this.positionList = res.data.records
|
|
|
})
|
|
|
},
|
|
|
|
|
|
// 获取详情
|
|
|
getDetail() {
|
|
|
- getOrderDetail({id: this.listItem.parentId}).then(res => {
|
|
|
- if(res.data.items) {
|
|
|
+ getOrderDetail({ id: this.listItem.parentId }).then(res => {
|
|
|
+ if (res.data.items) {
|
|
|
res.data.items.forEach(item => {
|
|
|
- item.number = (item.qty*100 - item.retiredQty*100) / 100;
|
|
|
- item.sums1 = ['number', 'directTransferQty', 'qty', 'enginNum', 'oldQty'];
|
|
|
- item.sums2 = ['totalAmount', 'payAmount', 'price', 'payRebateAmount', 'discAmount'];
|
|
|
+ item.number = (item.qty * 100 - item.retiredQty * 100) / 100
|
|
|
+ item.sums1 = ['number', 'directTransferQty', 'qty', 'enginNum', 'oldQty']
|
|
|
+ item.sums2 = ['totalAmount', 'payAmount', 'price', 'payRebateAmount', 'discAmount']
|
|
|
})
|
|
|
}
|
|
|
- this.detailData = res.data;
|
|
|
+ this.detailData = res.data
|
|
|
})
|
|
|
},
|
|
|
|
|
|
@@ -507,12 +517,12 @@ export default {
|
|
|
cancelButtonText: '取消',
|
|
|
type: 'warning'
|
|
|
}).then(() => {
|
|
|
- closeCom({id: this.listItem.parentId, refEnginRecordNo: this.detailData.refEnginRecordNo || '',
|
|
|
-}).then(res => {
|
|
|
- this.$successMsg();
|
|
|
- this.getDetail();
|
|
|
+ closeCom({ id: this.listItem.parentId, refEnginRecordNo: this.detailData.refEnginRecordNo || ''
|
|
|
+ }).then(res => {
|
|
|
+ this.$successMsg()
|
|
|
+ this.getDetail()
|
|
|
})
|
|
|
- }).catch(() => {});
|
|
|
+ }).catch(() => {})
|
|
|
},
|
|
|
|
|
|
// 直调完结
|
|
|
@@ -522,65 +532,64 @@ export default {
|
|
|
cancelButtonText: '取消',
|
|
|
type: 'warning'
|
|
|
}).then(() => {
|
|
|
- overOrder({id: this.listItem.parentId, refEnginRecordNo: this.detailData.refEnginRecordNo || '',}).then(res => {
|
|
|
- this.$successMsg();
|
|
|
- this.getDetail();
|
|
|
+ overOrder({ id: this.listItem.parentId, refEnginRecordNo: this.detailData.refEnginRecordNo || '' }).then(res => {
|
|
|
+ this.$successMsg()
|
|
|
+ this.getDetail()
|
|
|
})
|
|
|
- }).catch(() => {});
|
|
|
+ }).catch(() => {})
|
|
|
},
|
|
|
|
|
|
// 更改仓库
|
|
|
changeWarehouse() {
|
|
|
- this.deliverForm.position = '';
|
|
|
- let obj = this.warehouseList.find(o => o.id == this.deliverForm.warehouse);
|
|
|
- this.positionList = obj.kingDeeStocks;
|
|
|
+ this.deliverForm.position = ''
|
|
|
+ const obj = this.warehouseList.find(o => o.id == this.deliverForm.warehouse)
|
|
|
+ this.positionList = obj.kingDeeStocks
|
|
|
},
|
|
|
|
|
|
// 打开 直调发货
|
|
|
openDeliverDialog() {
|
|
|
- this.isShowDeliverDialog = true;
|
|
|
- this.deliverGoodsList = this.detailData.items;
|
|
|
+ this.isShowDeliverDialog = true
|
|
|
+ this.deliverGoodsList = this.detailData.items
|
|
|
this.deliverGoodsList.forEach(item => {
|
|
|
- item.warehouse1 = '';
|
|
|
- item.warehouse2 = '';
|
|
|
- item.position1 = '';
|
|
|
- item.position2 = '';
|
|
|
- item.status1 = '';
|
|
|
- item.status2 = '';
|
|
|
- this.$set(item,'realDirectTransferQty',item.refundableQty)
|
|
|
-
|
|
|
+ item.warehouse1 = ''
|
|
|
+ item.warehouse2 = ''
|
|
|
+ item.position1 = ''
|
|
|
+ item.position2 = ''
|
|
|
+ item.status1 = ''
|
|
|
+ item.status2 = ''
|
|
|
+ this.$set(item, 'realDirectTransferQty', item.refundableQty)
|
|
|
})
|
|
|
- this.getPositionList();
|
|
|
+ this.getPositionList()
|
|
|
},
|
|
|
|
|
|
// 关闭 直调发货
|
|
|
closeDeliverDialog() {
|
|
|
- this.isShowDeliverDialog = false;
|
|
|
+ this.isShowDeliverDialog = false
|
|
|
},
|
|
|
|
|
|
// 提交 直调发货
|
|
|
submitDeliverForm() {
|
|
|
this.$refs.deliverForm.validate((valid) => {
|
|
|
if (valid) {
|
|
|
- for(let i=0; i<this.deliverGoodsList.length; i++) {
|
|
|
- if(!this.deliverGoodsList[i].directTransferQty && this.deliverGoodsList[i].directTransferQty !== 0) {
|
|
|
- this.$errorMsg('请输入直调数量');
|
|
|
- return;
|
|
|
+ for (let i = 0; i < this.deliverGoodsList.length; i++) {
|
|
|
+ if (!this.deliverGoodsList[i].directTransferQty && this.deliverGoodsList[i].directTransferQty !== 0) {
|
|
|
+ this.$errorMsg('请输入直调数量')
|
|
|
+ return
|
|
|
}
|
|
|
}
|
|
|
- let params = {
|
|
|
+ const params = {
|
|
|
enginOrderId: this.detailData.enginOrderId,
|
|
|
enginOrderType: 'TRADE', // TRADE=商用 HOME=家用
|
|
|
deliverDate: this.deliverForm.date + ' 00:00:00',
|
|
|
correspondId: this.deliverForm.position,
|
|
|
- remark:this.deliverForm.remark,
|
|
|
+ remark: this.deliverForm.remark,
|
|
|
items: this.deliverGoodsList,
|
|
|
- refEnginRecordNo: this.detailData.refEnginRecordNo || '',
|
|
|
+ refEnginRecordNo: this.detailData.refEnginRecordNo || ''
|
|
|
}
|
|
|
deliverOrder(params).then(res => {
|
|
|
- this.$successMsg();
|
|
|
- this.isShowDeliverDialog = false;
|
|
|
- this.getDetail();
|
|
|
+ this.$successMsg()
|
|
|
+ this.isShowDeliverDialog = false
|
|
|
+ this.getDetail()
|
|
|
})
|
|
|
}
|
|
|
})
|
|
|
@@ -588,63 +597,63 @@ export default {
|
|
|
|
|
|
// 更改调出仓库
|
|
|
changeWarehouse1() {
|
|
|
- this.directForm.position1 = '';
|
|
|
- let obj = this.warehouseList1.find(o => o.id == this.directForm.warehouse1);
|
|
|
- this.positionList1 = obj.kingDeeStocks;
|
|
|
+ this.directForm.position1 = ''
|
|
|
+ const obj = this.warehouseList1.find(o => o.id == this.directForm.warehouse1)
|
|
|
+ this.positionList1 = obj.kingDeeStocks
|
|
|
this.directGoodsList.forEach(item => {
|
|
|
- item.warehouse1 = obj.name;
|
|
|
- });
|
|
|
+ item.warehouse1 = obj.name
|
|
|
+ })
|
|
|
},
|
|
|
|
|
|
// 更改调入仓库
|
|
|
changeWarehouse2() {
|
|
|
- this.directForm.position2 = '';
|
|
|
- let obj = this.warehouseList2.find(o => o.id == this.directForm.warehouse2);
|
|
|
- this.positionList2 = obj.kingDeeStocks;
|
|
|
+ this.directForm.position2 = ''
|
|
|
+ const obj = this.warehouseList2.find(o => o.id == this.directForm.warehouse2)
|
|
|
+ this.positionList2 = obj.kingDeeStocks
|
|
|
this.directGoodsList.forEach(item => {
|
|
|
- item.warehouse2 = obj.name;
|
|
|
- });
|
|
|
+ item.warehouse2 = obj.name
|
|
|
+ })
|
|
|
},
|
|
|
|
|
|
// 更改调出仓位
|
|
|
changePosition1() {
|
|
|
- let obj = this.positionList1.find(o => o.id == this.directForm.position1);
|
|
|
+ const obj = this.positionList1.find(o => o.id == this.directForm.position1)
|
|
|
this.directGoodsList.forEach(item => {
|
|
|
- item.position1 = obj.name;
|
|
|
- item.status1 = obj.defStockStatusName;
|
|
|
- });
|
|
|
+ item.position1 = obj.name
|
|
|
+ item.status1 = obj.defStockStatusName
|
|
|
+ })
|
|
|
},
|
|
|
|
|
|
// 更改调入仓位
|
|
|
changePosition2() {
|
|
|
- let obj = this.positionList2.find(o => o.id == this.directForm.position2);
|
|
|
+ const obj = this.positionList2.find(o => o.id == this.directForm.position2)
|
|
|
this.directGoodsList.forEach(item => {
|
|
|
- item.position2 = obj.name;
|
|
|
- item.status2 = obj.defStockStatusName;
|
|
|
- });
|
|
|
+ item.position2 = obj.name
|
|
|
+ item.status2 = obj.defStockStatusName
|
|
|
+ })
|
|
|
},
|
|
|
|
|
|
// 打开 提前开票
|
|
|
openDirectDialog() {
|
|
|
- this.isShowDirectDialog = true;
|
|
|
- this.directGoodsList = this.detailData.items;
|
|
|
- this.getWarehouseList();
|
|
|
+ this.isShowDirectDialog = true
|
|
|
+ this.directGoodsList = this.detailData.items
|
|
|
+ this.getWarehouseList()
|
|
|
},
|
|
|
|
|
|
// 关闭 提前开票
|
|
|
closeDirectDialog() {
|
|
|
- this.isShowDirectDialog = false;
|
|
|
+ this.isShowDirectDialog = false
|
|
|
},
|
|
|
|
|
|
// 提交 提前开票
|
|
|
submitDirectForm() {
|
|
|
this.$refs.directForm.validate((valid) => {
|
|
|
if (valid) {
|
|
|
- let warehouseItem1 = this.warehouseList1.find(o => o.id == this.directForm.warehouse1);
|
|
|
- let positionItem1 = this.positionList1.find(o => o.id == this.directForm.position1);
|
|
|
- let warehouseItem2 = this.warehouseList2.find(o => o.id == this.directForm.warehouse2);
|
|
|
- let positionItem2 = this.positionList2.find(o => o.id == this.directForm.position2);
|
|
|
- let params = {
|
|
|
+ const warehouseItem1 = this.warehouseList1.find(o => o.id == this.directForm.warehouse1)
|
|
|
+ const positionItem1 = this.positionList1.find(o => o.id == this.directForm.position1)
|
|
|
+ const warehouseItem2 = this.warehouseList2.find(o => o.id == this.directForm.warehouse2)
|
|
|
+ const positionItem2 = this.positionList2.find(o => o.id == this.directForm.position2)
|
|
|
+ const params = {
|
|
|
orderNo: this.detailData.enginOrderId,
|
|
|
orderType: 'TRADE', // TRADE=商用 HOME=家用 RETAIL=零售单 RETAIL_POLICY 销售政策单
|
|
|
correspondId: this.directForm.warehouse1,
|
|
|
@@ -655,13 +664,13 @@ export default {
|
|
|
inCorrespondName: warehouseItem2.name,
|
|
|
inStockId: this.directForm.position2,
|
|
|
inStockName: positionItem2.name,
|
|
|
- refEnginRecordNo: this.detailData.refEnginRecordNo || '',
|
|
|
+ refEnginRecordNo: this.detailData.refEnginRecordNo || ''
|
|
|
|
|
|
}
|
|
|
directOrder(params).then(res => {
|
|
|
- this.$successMsg();
|
|
|
- this.isShowDirectDialog = false;
|
|
|
- this.getDetail();
|
|
|
+ this.$successMsg()
|
|
|
+ this.isShowDirectDialog = false
|
|
|
+ this.getDetail()
|
|
|
})
|
|
|
}
|
|
|
})
|
|
|
@@ -669,13 +678,13 @@ export default {
|
|
|
|
|
|
// 联查单据
|
|
|
toCheckOrder() {
|
|
|
- this.checkOrderId = this.detailData.enginOrderId;
|
|
|
- this.isShowCheckOrder = true;
|
|
|
+ this.checkOrderId = this.detailData.enginOrderId
|
|
|
+ this.isShowCheckOrder = true
|
|
|
},
|
|
|
|
|
|
backDetail() {
|
|
|
- this.isShowCheckOrder = false;
|
|
|
- },
|
|
|
+ this.isShowCheckOrder = false
|
|
|
+ }
|
|
|
|
|
|
}
|
|
|
}
|
howie