|
@@ -16,7 +16,7 @@
|
|
@keyup.enter.native="handleQuery"
|
|
@keyup.enter.native="handleQuery"
|
|
/>
|
|
/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <el-form-item label="通知日期" prop="noticeDate">
|
|
|
|
|
|
+ <el-form-item label="日期" prop="noticeDate">
|
|
<el-date-picker
|
|
<el-date-picker
|
|
clearable
|
|
clearable
|
|
v-model="queryParams.noticeDate"
|
|
v-model="queryParams.noticeDate"
|
|
@@ -68,7 +68,7 @@
|
|
</el-form>
|
|
</el-form>
|
|
|
|
|
|
<el-row :gutter="10" class="mb8">
|
|
<el-row :gutter="10" class="mb8">
|
|
- <el-col :span="1.5">
|
|
|
|
|
|
+ <!-- <el-col :span="1.5">
|
|
<el-button
|
|
<el-button
|
|
type="primary"
|
|
type="primary"
|
|
plain
|
|
plain
|
|
@@ -113,7 +113,7 @@
|
|
v-hasPermi="['system:ProductInvoice:export']"
|
|
v-hasPermi="['system:ProductInvoice:export']"
|
|
>导出</el-button
|
|
>导出</el-button
|
|
>
|
|
>
|
|
- </el-col>
|
|
|
|
|
|
+ </el-col> -->
|
|
<right-toolbar
|
|
<right-toolbar
|
|
:showSearch.sync="showSearch"
|
|
:showSearch.sync="showSearch"
|
|
@queryTable="getList"
|
|
@queryTable="getList"
|
|
@@ -125,11 +125,10 @@
|
|
:data="ProductInvoiceList"
|
|
:data="ProductInvoiceList"
|
|
@selection-change="handleSelectionChange"
|
|
@selection-change="handleSelectionChange"
|
|
>
|
|
>
|
|
- <el-table-column type="selection" width="55" align="center" />
|
|
|
|
- <el-table-column label="编号" align="center" prop="id" />
|
|
|
|
- <el-table-column label="通知单号" align="center" prop="noticeNumber" />
|
|
|
|
|
|
+ <!-- <el-table-column label="编号" align="center" prop="id" />
|
|
|
|
+ -->
|
|
<el-table-column
|
|
<el-table-column
|
|
- label="通知日期"
|
|
|
|
|
|
+ label="日期"
|
|
align="center"
|
|
align="center"
|
|
prop="noticeDate"
|
|
prop="noticeDate"
|
|
width="180"
|
|
width="180"
|
|
@@ -138,15 +137,17 @@
|
|
<span>{{ parseTime(scope.row.noticeDate, "{y}-{m}-{d}") }}</span>
|
|
<span>{{ parseTime(scope.row.noticeDate, "{y}-{m}-{d}") }}</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column label="销售员" align="center" prop="salesman" />
|
|
|
|
|
|
+ <el-table-column label="通知单号" align="center" prop="noticeNumber" />
|
|
|
|
+
|
|
|
|
+ <!-- <el-table-column label="销售员" align="center" prop="salesman" />
|
|
<el-table-column label="客户编号" align="center" prop="customerId" />
|
|
<el-table-column label="客户编号" align="center" prop="customerId" />
|
|
<el-table-column label="开票员" align="center" prop="drawer" />
|
|
<el-table-column label="开票员" align="center" prop="drawer" />
|
|
<el-table-column
|
|
<el-table-column
|
|
label="发货单备注"
|
|
label="发货单备注"
|
|
align="center"
|
|
align="center"
|
|
prop="dispatchNoteRemark"
|
|
prop="dispatchNoteRemark"
|
|
- />
|
|
|
|
- <el-table-column label="开票类型" align="center" prop="billingType" />
|
|
|
|
|
|
+ /> -->
|
|
|
|
+ <!-- <el-table-column label="开票类型" align="center" prop="billingType" />
|
|
<el-table-column
|
|
<el-table-column
|
|
label="货车登记"
|
|
label="货车登记"
|
|
align="center"
|
|
align="center"
|
|
@@ -155,36 +156,41 @@
|
|
<el-table-column label="单据类型" align="center" prop="documentType" />
|
|
<el-table-column label="单据类型" align="center" prop="documentType" />
|
|
<el-table-column label="售货单位" align="center" prop="sellingUnit" />
|
|
<el-table-column label="售货单位" align="center" prop="sellingUnit" />
|
|
<el-table-column label="计算类型" align="center" prop="calculationType" />
|
|
<el-table-column label="计算类型" align="center" prop="calculationType" />
|
|
- <el-table-column label="审核意见" align="center" prop="auditOpinion" />
|
|
|
|
|
|
+ <el-table-column label="审核意见" align="center" prop="auditOpinion" /> -->
|
|
|
|
+ <el-table-column label="客户名称" align="center" prop="customerName" />
|
|
<el-table-column label="状态" align="center" prop="status" />
|
|
<el-table-column label="状态" align="center" prop="status" />
|
|
- <el-table-column label="销售单合同号" align="center" prop="saleOrderNo" />
|
|
|
|
- <el-table-column label="备用列" align="center" prop="spare1" />
|
|
|
|
- <el-table-column label="备用列" align="center" prop="spare2" />
|
|
|
|
- <el-table-column label="备用列" align="center" prop="spare3" />
|
|
|
|
- <el-table-column label="备用列" align="center" prop="spare4" />
|
|
|
|
- <el-table-column label="备注" align="center" prop="remark" />
|
|
|
|
|
|
+
|
|
|
|
+ <!-- <el-table-column label="销售单合同号" align="center" prop="saleOrderNo" />
|
|
|
|
+ <el-table-column label="备注" align="center" prop="remark" /> -->
|
|
<el-table-column
|
|
<el-table-column
|
|
label="操作"
|
|
label="操作"
|
|
align="center"
|
|
align="center"
|
|
class-name="small-padding fixed-width"
|
|
class-name="small-padding fixed-width"
|
|
>
|
|
>
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- <el-button
|
|
|
|
- size="mini"
|
|
|
|
- type="text"
|
|
|
|
- icon="el-icon-edit"
|
|
|
|
- @click="handleUpdate(scope.row)"
|
|
|
|
- v-hasPermi="['system:ProductInvoice:edit']"
|
|
|
|
- >修改</el-button
|
|
|
|
- >
|
|
|
|
- <el-button
|
|
|
|
- size="mini"
|
|
|
|
- type="text"
|
|
|
|
- icon="el-icon-delete"
|
|
|
|
- @click="handleDelete(scope.row)"
|
|
|
|
- v-hasPermi="['system:ProductInvoice:remove']"
|
|
|
|
- >删除</el-button
|
|
|
|
- >
|
|
|
|
|
|
+ <el-dropdown>
|
|
|
|
+ <el-button type="warning" plain size="small">
|
|
|
|
+ 处理<i class="el-icon-arrow-down el-icon--right"></i>
|
|
|
|
+ </el-button>
|
|
|
|
+ <el-dropdown-menu slot="dropdown">
|
|
|
|
+ <el-dropdown-item>
|
|
|
|
+ <el-button
|
|
|
|
+ type="text"
|
|
|
|
+ size="mini"
|
|
|
|
+ @click="handleDeliverOrder(scope.$index, scope.row)"
|
|
|
|
+ >打印发货单</el-button
|
|
|
|
+ >
|
|
|
|
+ </el-dropdown-item>
|
|
|
|
+ <el-dropdown-item>
|
|
|
|
+ <el-button
|
|
|
|
+ type="text"
|
|
|
|
+ size="mini"
|
|
|
|
+ @click="handleSendOrder(scope.$index, scope.row)"
|
|
|
|
+ >打印送货单</el-button
|
|
|
|
+ >
|
|
|
|
+ </el-dropdown-item>
|
|
|
|
+ </el-dropdown-menu>
|
|
|
|
+ </el-dropdown>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
</el-table>
|
|
</el-table>
|
|
@@ -196,87 +202,7 @@
|
|
:limit.sync="queryParams.pageSize"
|
|
:limit.sync="queryParams.pageSize"
|
|
@pagination="getList"
|
|
@pagination="getList"
|
|
/>
|
|
/>
|
|
-
|
|
|
|
- <!-- 添加或修改产品发货单对话框 -->
|
|
|
|
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
|
|
|
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
|
|
|
- <el-form-item label="通知单号" prop="noticeNumber">
|
|
|
|
- <el-input v-model="form.noticeNumber" placeholder="请输入通知单号" />
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="通知日期" prop="noticeDate">
|
|
|
|
- <el-date-picker
|
|
|
|
- clearable
|
|
|
|
- v-model="form.noticeDate"
|
|
|
|
- type="date"
|
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
|
- placeholder="请选择通知日期"
|
|
|
|
- >
|
|
|
|
- </el-date-picker>
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="销售员" prop="salesman">
|
|
|
|
- <el-input v-model="form.salesman" placeholder="请输入销售员" />
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="客户编号" prop="customerId">
|
|
|
|
- <el-input v-model="form.customerId" placeholder="请输入客户编号" />
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="开票员" prop="drawer">
|
|
|
|
- <el-input v-model="form.drawer" placeholder="请输入开票员" />
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="发货单备注" prop="dispatchNoteRemark">
|
|
|
|
- <el-input
|
|
|
|
- v-model="form.dispatchNoteRemark"
|
|
|
|
- type="textarea"
|
|
|
|
- placeholder="请输入内容"
|
|
|
|
- />
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="货车登记" prop="truckRegistration">
|
|
|
|
- <el-input
|
|
|
|
- v-model="form.truckRegistration"
|
|
|
|
- placeholder="请输入货车登记"
|
|
|
|
- />
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="售货单位" prop="sellingUnit">
|
|
|
|
- <el-input v-model="form.sellingUnit" placeholder="请输入售货单位" />
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="审核意见" prop="auditOpinion">
|
|
|
|
- <el-input v-model="form.auditOpinion" placeholder="请输入审核意见" />
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="销售单合同号" prop="saleOrderNo">
|
|
|
|
- <el-input
|
|
|
|
- v-model="form.saleOrderNo"
|
|
|
|
- placeholder="请输入销售单合同号"
|
|
|
|
- />
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="备用列" prop="spare1">
|
|
|
|
- <el-input v-model="form.spare1" placeholder="请输入备用列" />
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="备用列" prop="spare2">
|
|
|
|
- <el-input v-model="form.spare2" placeholder="请输入备用列" />
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="备用列" prop="spare3">
|
|
|
|
- <el-input v-model="form.spare3" placeholder="请输入备用列" />
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="备用列" prop="spare4">
|
|
|
|
- <el-input v-model="form.spare4" placeholder="请输入备用列" />
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="备注" prop="remark">
|
|
|
|
- <el-input v-model="form.remark" placeholder="请输入备注" />
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="删除标志" prop="delFlag">
|
|
|
|
- <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="创建者ID" prop="createById">
|
|
|
|
- <el-input v-model="form.createById" placeholder="请输入创建者ID" />
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="修改者ID" prop="updateById">
|
|
|
|
- <el-input v-model="form.updateById" placeholder="请输入修改者ID" />
|
|
|
|
- </el-form-item>
|
|
|
|
- </el-form>
|
|
|
|
- <div slot="footer" class="dialog-footer">
|
|
|
|
- <el-button type="primary" @click="submitForm">确 定</el-button>
|
|
|
|
- <el-button @click="cancel">取 消</el-button>
|
|
|
|
- </div>
|
|
|
|
- </el-dialog>
|
|
|
|
|
|
+ <div id="printDom"></div>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
@@ -288,6 +214,12 @@ import {
|
|
addProductInvoice,
|
|
addProductInvoice,
|
|
updateProductInvoice,
|
|
updateProductInvoice,
|
|
} from "@/api/system/ProductInvoice";
|
|
} from "@/api/system/ProductInvoice";
|
|
|
|
+import deliverOrderPrint from "@/utils/print/deliverOrderPrint";
|
|
|
|
+import {
|
|
|
|
+ productInvoiceInfo,
|
|
|
|
+ queryDropDownBoxData,
|
|
|
|
+} from "@/api/tablelist/commonTable";
|
|
|
|
+import { mapState } from "vuex";
|
|
|
|
|
|
export default {
|
|
export default {
|
|
name: "ProductInvoice",
|
|
name: "ProductInvoice",
|
|
@@ -328,11 +260,6 @@ export default {
|
|
calculationType: null,
|
|
calculationType: null,
|
|
auditOpinion: null,
|
|
auditOpinion: null,
|
|
status: null,
|
|
status: null,
|
|
- saleOrderNo: null,
|
|
|
|
- spare1: null,
|
|
|
|
- spare2: null,
|
|
|
|
- spare3: null,
|
|
|
|
- spare4: null,
|
|
|
|
},
|
|
},
|
|
// 表单参数
|
|
// 表单参数
|
|
form: {},
|
|
form: {},
|
|
@@ -343,7 +270,65 @@ export default {
|
|
created() {
|
|
created() {
|
|
this.getList();
|
|
this.getList();
|
|
},
|
|
},
|
|
|
|
+ computed: {
|
|
|
|
+ ...mapState({
|
|
|
|
+ username: (state) => state.user.name,
|
|
|
|
+ }),
|
|
|
|
+ },
|
|
methods: {
|
|
methods: {
|
|
|
|
+ // 打印发货单回调
|
|
|
|
+ async handleDeliverOrder(index, row) {
|
|
|
|
+ let { saleOrderNo } = row;
|
|
|
|
+ if (!saleOrderNo) {
|
|
|
|
+ this.$message.error("数据异常,暂无saleOrderNo");
|
|
|
|
+ }
|
|
|
|
+ let payload = {
|
|
|
|
+ saleOrderNo: saleOrderNo,
|
|
|
|
+ };
|
|
|
|
+ let res = await productInvoiceInfo(payload);
|
|
|
|
+ if (res.code == 200) {
|
|
|
|
+ let printData = res.data;
|
|
|
|
+ console.log("printData", {
|
|
|
|
+ ...printData,
|
|
|
|
+ ...row,
|
|
|
|
+ printUser: this.username,
|
|
|
|
+ });
|
|
|
|
+ deliverOrderPrint(
|
|
|
|
+ { ...printData, ...row, printUser: this.username },
|
|
|
|
+ "printDom"
|
|
|
|
+ );
|
|
|
|
+ } else {
|
|
|
|
+ console.log(res);
|
|
|
|
+ this.$message.error(res.msg);
|
|
|
|
+ }
|
|
|
|
+ // deliverOrderPrint(row, "printDom");
|
|
|
|
+ },
|
|
|
|
+ // 打印送货单回调
|
|
|
|
+ async handleSendOrder(index, row) {
|
|
|
|
+ let { saleOrderNo } = row;
|
|
|
|
+ if (!saleOrderNo) {
|
|
|
|
+ this.$message.error("数据异常,暂无saleOrderNo");
|
|
|
|
+ }
|
|
|
|
+ let payload = {
|
|
|
|
+ saleOrderNo: saleOrderNo,
|
|
|
|
+ };
|
|
|
|
+ let res = await productInvoiceInfo(payload);
|
|
|
|
+ if (res.code == 200) {
|
|
|
|
+ let printData = res.data;
|
|
|
|
+ console.log("printData", {
|
|
|
|
+ ...printData,
|
|
|
|
+ ...row,
|
|
|
|
+ printUser: this.username,
|
|
|
|
+ });
|
|
|
|
+ sendOrderPrint(
|
|
|
|
+ { ...printData, ...row, printUser: this.username },
|
|
|
|
+ "printDom"
|
|
|
|
+ );
|
|
|
|
+ } else {
|
|
|
|
+ console.log(res);
|
|
|
|
+ this.$message.error(res.msg);
|
|
|
|
+ }
|
|
|
|
+ },
|
|
/** 查询产品发货单列表 */
|
|
/** 查询产品发货单列表 */
|
|
getList() {
|
|
getList() {
|
|
this.loading = true;
|
|
this.loading = true;
|