|
@@ -10,39 +10,46 @@
|
|
<el-row>
|
|
<el-row>
|
|
<el-col :span="8" class="item">
|
|
<el-col :span="8" class="item">
|
|
<div class="label">订单号</div>
|
|
<div class="label">订单号</div>
|
|
- <div class="value">{{detailData.id}}</div>
|
|
|
|
|
|
+ <div class="value">{{ detailData.id }}</div>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="8" class="item">
|
|
<el-col :span="8" class="item">
|
|
<div class="label">订单日期</div>
|
|
<div class="label">订单日期</div>
|
|
- <div class="value">{{detailData.theTime}}</div>
|
|
|
|
|
|
+ <div class="value">{{ detailData.theTime }}</div>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="8" class="item">
|
|
<el-col :span="8" class="item">
|
|
<div class="label">单据状态</div>
|
|
<div class="label">单据状态</div>
|
|
- <div class="value">{{detailData.examineStatus | statusFilter}}</div>
|
|
|
|
|
|
+ <div class="value">{{ detailData.examineStatus | statusFilter }}</div>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="8" class="item">
|
|
<el-col :span="8" class="item">
|
|
<div class="label">业务员</div>
|
|
<div class="label">业务员</div>
|
|
- <div class="value">{{detailData.k3ServiceName}}</div>
|
|
|
|
|
|
+ <div class="value">{{ detailData.k3ServiceName }}</div>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="16" class="item">
|
|
<el-col :span="16" class="item">
|
|
<div class="label">文件编号</div>
|
|
<div class="label">文件编号</div>
|
|
- <div class="value">{{detailData.fileNo}}</div>
|
|
|
|
|
|
+ <div class="value">{{ detailData.fileNo }}</div>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="24" class="item">
|
|
<el-col :span="24" class="item">
|
|
<div class="label">备注</div>
|
|
<div class="label">备注</div>
|
|
- <div class="value">{{detailData.remark}}</div>
|
|
|
|
|
|
+ <div class="value">
|
|
|
|
+ <template v-if="userName">
|
|
|
|
+ <el-input v-model="detailData.remark" placeholder="填写备注" clearable></el-input>
|
|
|
|
+ </template>
|
|
|
|
+ <template v-else>
|
|
|
|
+ {{ detailData.remark }}
|
|
|
|
+ </template>
|
|
|
|
+ </div>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="8" class="item">
|
|
<el-col :span="8" class="item">
|
|
<div class="label">制单人</div>
|
|
<div class="label">制单人</div>
|
|
- <div class="value">{{detailData.createName}}</div>
|
|
|
|
|
|
+ <div class="value">{{ detailData.createName }}</div>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="8" class="item">
|
|
<el-col :span="8" class="item">
|
|
<div class="label">审核人</div>
|
|
<div class="label">审核人</div>
|
|
- <div class="value">{{detailData.examineName}}</div>
|
|
|
|
|
|
+ <div class="value">{{ detailData.examineName }}</div>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="8" class="item">
|
|
<el-col :span="8" class="item">
|
|
<div class="label">关闭人</div>
|
|
<div class="label">关闭人</div>
|
|
- <div class="value">{{detailData.closeName}}</div>
|
|
|
|
|
|
+ <div class="value">{{ detailData.closeName }}</div>
|
|
</el-col>
|
|
</el-col>
|
|
</el-row>
|
|
</el-row>
|
|
</div>
|
|
</div>
|
|
@@ -61,42 +68,167 @@
|
|
stripe
|
|
stripe
|
|
max-height="400"
|
|
max-height="400"
|
|
show-summary
|
|
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="120" show-overflow-tooltip></el-table-column>
|
|
|
|
- <el-table-column align="center" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
|
|
|
|
- <el-table-column align="center" label="产品名称" prop="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="fileNo" 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>
|
|
|
|
+ <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="120"
|
|
|
|
+ show-overflow-tooltip
|
|
|
|
+ ></el-table-column>
|
|
|
|
+ <el-table-column
|
|
|
|
+ align="center"
|
|
|
|
+ label="产品编码"
|
|
|
|
+ prop="materialOldNumber"
|
|
|
|
+ min-width="120"
|
|
|
|
+ show-overflow-tooltip
|
|
|
|
+ ></el-table-column>
|
|
|
|
+ <el-table-column
|
|
|
|
+ align="center"
|
|
|
|
+ label="产品名称"
|
|
|
|
+ prop="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="fileNo"
|
|
|
|
+ min-width="100"
|
|
|
|
+ show-overflow-tooltip
|
|
|
|
+ ></el-table-column>
|
|
|
|
|
|
-
|
|
|
|
- <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
|
|
|
|
|
|
+ <el-table-column
|
|
|
|
+ align="right"
|
|
|
|
+ label="单价"
|
|
|
|
+ prop="price"
|
|
|
|
+ min-width="100"
|
|
|
|
+ show-overflow-tooltip
|
|
|
|
+ >
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
{{ scope.row.price | numToFixed }}
|
|
{{ scope.row.price | numToFixed }}
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
|
|
|
|
- <el-table-column align="right" label="订单金额" prop="totalAmount" min-width="100" show-overflow-tooltip>
|
|
|
|
|
|
+ <el-table-column
|
|
|
|
+ align="right"
|
|
|
|
+ label="数量"
|
|
|
|
+ prop="refundableQty"
|
|
|
|
+ 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">
|
|
<template slot-scope="scope">
|
|
{{ scope.row.totalAmount | numToFixed }}
|
|
{{ scope.row.totalAmount | numToFixed }}
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</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="rebateAmount" min-width="100" show-overflow-tooltip></el-table-column>
|
|
|
|
- <el-table-column align="right" label="格力折扣" prop="totalDiscAmount" min-width="100" show-overflow-tooltip></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></el-table-column>
|
|
|
|
- <el-table-column align="center" label="是否直调" prop="isDirectTransfer" min-width="100" show-overflow-tooltip>
|
|
|
|
|
|
+ <el-table-column
|
|
|
|
+ align="center"
|
|
|
|
+ label="返利类型"
|
|
|
|
+ prop="customerWalletName2"
|
|
|
|
+ min-width="140"
|
|
|
|
+ show-overflow-tooltip
|
|
|
|
+ ></el-table-column>
|
|
|
|
+ <el-table-column
|
|
|
|
+ align="right"
|
|
|
|
+ label="返利金额"
|
|
|
|
+ prop="rebateAmount"
|
|
|
|
+ min-width="100"
|
|
|
|
+ show-overflow-tooltip
|
|
|
|
+ ></el-table-column>
|
|
|
|
+ <el-table-column
|
|
|
|
+ align="right"
|
|
|
|
+ label="格力折扣"
|
|
|
|
+ prop="totalDiscAmount"
|
|
|
|
+ min-width="100"
|
|
|
|
+ show-overflow-tooltip
|
|
|
|
+ ></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
|
|
|
|
+ ></el-table-column>
|
|
|
|
+ <el-table-column
|
|
|
|
+ align="center"
|
|
|
|
+ label="是否直调"
|
|
|
|
+ prop="isDirectTransfer"
|
|
|
|
+ min-width="100"
|
|
|
|
+ show-overflow-tooltip
|
|
|
|
+ >
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- {{scope.row.isDirectTransfer ? '是':'否'}}
|
|
|
|
|
|
+ {{ scope.row.isDirectTransfer ? "是" : "否" }}
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</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-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>
|
|
</el-table>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
@@ -107,7 +239,7 @@
|
|
<el-row :gutter="0">
|
|
<el-row :gutter="0">
|
|
<el-col :span="12" class="item">
|
|
<el-col :span="12" class="item">
|
|
<div class="label">审批人</div>
|
|
<div class="label">审批人</div>
|
|
- <div class="value">{{userName}}</div>
|
|
|
|
|
|
+ <div class="value">{{ userName }}</div>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="12" class="item">
|
|
<el-col :span="12" class="item">
|
|
<div class="label">审批结果</div>
|
|
<div class="label">审批结果</div>
|
|
@@ -120,18 +252,27 @@
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="24" class="item">
|
|
<el-col :span="24" class="item">
|
|
<div class="label">审批说明</div>
|
|
<div class="label">审批说明</div>
|
|
- <div class="value"><el-input v-model="mainForm.remark" placeholder="请输入内容"></el-input></div>
|
|
|
|
|
|
+ <div class="value">
|
|
|
|
+ <el-input
|
|
|
|
+ v-model="mainForm.remark"
|
|
|
|
+ placeholder="请输入内容"
|
|
|
|
+ ></el-input>
|
|
|
|
+ </div>
|
|
</el-col>
|
|
</el-col>
|
|
</el-row>
|
|
</el-row>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
<div class="page-footer">
|
|
<div class="page-footer">
|
|
<div class="footer">
|
|
<div class="footer">
|
|
- <el-button type="primary" @click="clickSubmitForm" :loading="formLoading">{{ formLoading ? '提交中 ...' : '提 交' }}</el-button>
|
|
|
|
|
|
+ <el-button
|
|
|
|
+ type="primary"
|
|
|
|
+ @click="clickSubmitForm"
|
|
|
|
+ :loading="formLoading"
|
|
|
|
+ >{{ formLoading ? "提交中 ..." : "提 交" }}</el-button
|
|
|
|
+ >
|
|
<el-button @click="goBack">关 闭</el-button>
|
|
<el-button @click="goBack">关 闭</el-button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
-
|
|
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
@@ -139,20 +280,20 @@
|
|
import { getDetail, examineData } from "@/api/supply/retail";
|
|
import { getDetail, examineData } from "@/api/supply/retail";
|
|
|
|
|
|
export default {
|
|
export default {
|
|
- name: 'RetailExamine',
|
|
|
|
- componentName: 'RetailExamine',
|
|
|
|
- props: ['listItem'],
|
|
|
|
|
|
+ name: "RetailExamine",
|
|
|
|
+ componentName: "RetailExamine",
|
|
|
|
+ props: ["listItem"],
|
|
filters: {
|
|
filters: {
|
|
statusFilter(val) {
|
|
statusFilter(val) {
|
|
const statusList = [
|
|
const statusList = [
|
|
- { label: '已保存', value: 'SAVE' },
|
|
|
|
- { label: '待审核', value: 'WAIT' },
|
|
|
|
- { label: '审核通过', value: 'OK' },
|
|
|
|
- // { label: '审核驳回', value: 'FAIL' },,
|
|
|
|
|
|
+ { label: "已保存", value: "SAVE" },
|
|
|
|
+ { label: "待审核", value: "WAIT" },
|
|
|
|
+ { label: "审核通过", value: "OK" },
|
|
|
|
+ // { label: '审核驳回', value: 'FAIL' },,
|
|
];
|
|
];
|
|
- let obj = statusList.find(o => o.value == val);
|
|
|
|
- return obj ? obj.label : ''
|
|
|
|
- }
|
|
|
|
|
|
+ let obj = statusList.find((o) => o.value == val);
|
|
|
|
+ return obj ? obj.label : "";
|
|
|
|
+ },
|
|
},
|
|
},
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
@@ -162,9 +303,9 @@ export default {
|
|
formLoading: false,
|
|
formLoading: false,
|
|
mainForm: {
|
|
mainForm: {
|
|
status: true,
|
|
status: true,
|
|
- remark: '',
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ remark: "",
|
|
|
|
+ },
|
|
|
|
+ };
|
|
},
|
|
},
|
|
|
|
|
|
created() {
|
|
created() {
|
|
@@ -174,20 +315,33 @@ export default {
|
|
methods: {
|
|
methods: {
|
|
// 返回列表
|
|
// 返回列表
|
|
goBack() {
|
|
goBack() {
|
|
- this.$emit('backListFormDetail');
|
|
|
|
|
|
+ this.$emit("backListFormDetail");
|
|
},
|
|
},
|
|
|
|
|
|
// 获取详情
|
|
// 获取详情
|
|
getDetail() {
|
|
getDetail() {
|
|
- getDetail({id: this.listItem.id}).then(res => {
|
|
|
|
- if(res.data.retailOrderItemList) {
|
|
|
|
- res.data.retailOrderItemList.forEach(item => {
|
|
|
|
- item.sums1 = ['directTransferQty', 'qty', 'refundableQty', 'oldQty', 'tdQty'];
|
|
|
|
- item.sums2 = ['totalAmount', 'payAmount', 'price', 'discAmount', 'totalDiscAmount', 'rebateAmount'];
|
|
|
|
- })
|
|
|
|
|
|
+ getDetail({ id: this.listItem.id }).then((res) => {
|
|
|
|
+ if (res.data.retailOrderItemList) {
|
|
|
|
+ res.data.retailOrderItemList.forEach((item) => {
|
|
|
|
+ item.sums1 = [
|
|
|
|
+ "directTransferQty",
|
|
|
|
+ "qty",
|
|
|
|
+ "refundableQty",
|
|
|
|
+ "oldQty",
|
|
|
|
+ "tdQty",
|
|
|
|
+ ];
|
|
|
|
+ item.sums2 = [
|
|
|
|
+ "totalAmount",
|
|
|
|
+ "payAmount",
|
|
|
|
+ "price",
|
|
|
|
+ "discAmount",
|
|
|
|
+ "totalDiscAmount",
|
|
|
|
+ "rebateAmount",
|
|
|
|
+ ];
|
|
|
|
+ });
|
|
}
|
|
}
|
|
this.detailData = res.data;
|
|
this.detailData = res.data;
|
|
- })
|
|
|
|
|
|
+ });
|
|
},
|
|
},
|
|
|
|
|
|
// 提交审批
|
|
// 提交审批
|
|
@@ -195,38 +349,40 @@ export default {
|
|
this.formLoading = true;
|
|
this.formLoading = true;
|
|
examineData({
|
|
examineData({
|
|
id: this.listItem.id,
|
|
id: this.listItem.id,
|
|
- examineStatus: this.mainForm.status ? 'OK' : 'FAIL',
|
|
|
|
|
|
+ examineStatus: this.mainForm.status ? "OK" : "FAIL",
|
|
examineRemark: this.mainForm.remark,
|
|
examineRemark: this.mainForm.remark,
|
|
- }).then(res => {
|
|
|
|
- this.$successMsg('审批成功');
|
|
|
|
- this.goBack();
|
|
|
|
- this.$parent.getList();
|
|
|
|
- }).finally(res => {
|
|
|
|
- this.formLoading = false;
|
|
|
|
|
|
+ remark: this.detailData.remark,
|
|
})
|
|
})
|
|
|
|
+ .then((res) => {
|
|
|
|
+ this.$successMsg("审批成功");
|
|
|
|
+ this.goBack();
|
|
|
|
+ this.$parent.getList();
|
|
|
|
+ })
|
|
|
|
+ .finally((res) => {
|
|
|
|
+ this.formLoading = false;
|
|
|
|
+ });
|
|
},
|
|
},
|
|
-
|
|
|
|
- }
|
|
|
|
-}
|
|
|
|
|
|
+ },
|
|
|
|
+};
|
|
</script>
|
|
</script>
|
|
|
|
|
|
<style scoped lang="scss">
|
|
<style scoped lang="scss">
|
|
- .detail-container {
|
|
|
|
- width: 100%;
|
|
|
|
- height: 100%;
|
|
|
|
- }
|
|
|
|
- .main-title {
|
|
|
|
- display: flex;
|
|
|
|
- justify-content: space-between;
|
|
|
|
- align-items: center;
|
|
|
|
- margin-top: 20px;
|
|
|
|
- height: 60px;
|
|
|
|
- border-bottom: 1px solid #DCDFE6;
|
|
|
|
- margin-bottom: 20px;
|
|
|
|
- .title {
|
|
|
|
- font-size: 16px;
|
|
|
|
- font-weight: 600;
|
|
|
|
- padding-left: 10px;
|
|
|
|
- }
|
|
|
|
|
|
+.detail-container {
|
|
|
|
+ width: 100%;
|
|
|
|
+ height: 100%;
|
|
|
|
+}
|
|
|
|
+.main-title {
|
|
|
|
+ display: flex;
|
|
|
|
+ justify-content: space-between;
|
|
|
|
+ align-items: center;
|
|
|
|
+ margin-top: 20px;
|
|
|
|
+ height: 60px;
|
|
|
|
+ border-bottom: 1px solid #dcdfe6;
|
|
|
|
+ margin-bottom: 20px;
|
|
|
|
+ .title {
|
|
|
|
+ font-size: 16px;
|
|
|
|
+ font-weight: 600;
|
|
|
|
+ padding-left: 10px;
|
|
}
|
|
}
|
|
|
|
+}
|
|
</style>
|
|
</style>
|