|
@@ -362,7 +362,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item label="交货周期:" size="normal">
|
|
|
+ <el-form-item label="交货周期:" size="normal" prop="saleLeadTime">
|
|
|
<el-input size="small" v-model="formData.saleLeadTime"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
@@ -611,7 +611,7 @@
|
|
|
<div ref="detailTable" id="detail"></div>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button @click="detailShow = false">取 消</el-button>
|
|
|
- <el-button type="primary" @click="detailPrintHandler">确 定</el-button>
|
|
|
+ <el-button type="primary" @click="detailPrintHandler">打 印</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
<div id="printDom"></div>
|
|
@@ -704,7 +704,36 @@ export default {
|
|
|
// remark: "", //备注
|
|
|
// },
|
|
|
],
|
|
|
- rules: {},
|
|
|
+ rules: {
|
|
|
+ saleDate: [
|
|
|
+ {
|
|
|
+ required: true,
|
|
|
+ message: "请选择日期",
|
|
|
+ trigger: "change",
|
|
|
+ },
|
|
|
+ ],
|
|
|
+ customerName: [
|
|
|
+ {
|
|
|
+ required: true,
|
|
|
+ message: "请选择客户",
|
|
|
+ trigger: "change",
|
|
|
+ },
|
|
|
+ ],
|
|
|
+ saleDate: [
|
|
|
+ {
|
|
|
+ required: true,
|
|
|
+ message: "请选择预计下单时间",
|
|
|
+ trigger: "change",
|
|
|
+ },
|
|
|
+ ],
|
|
|
+ saleLeadTime: [
|
|
|
+ {
|
|
|
+ required: true,
|
|
|
+ message: "请输入交货周期",
|
|
|
+ trigger: "blur",
|
|
|
+ },
|
|
|
+ ],
|
|
|
+ },
|
|
|
|
|
|
// end
|
|
|
// 绑定按钮dialog
|
|
@@ -733,7 +762,6 @@ export default {
|
|
|
dateRange: [],
|
|
|
// 表单参数
|
|
|
form: {},
|
|
|
- rules: {},
|
|
|
// cru 弹窗
|
|
|
open: false,
|
|
|
// excel共通导入数据
|
|
@@ -2185,7 +2213,6 @@ export default {
|
|
|
this.$nextTick(() => {
|
|
|
this.$refs.detailTable.innerHTML = this.printDomData;
|
|
|
});
|
|
|
- console.log(row);
|
|
|
},
|
|
|
// 打印回调
|
|
|
detailPrintHandler() {
|
|
@@ -2277,7 +2304,10 @@ export default {
|
|
|
<tbody>
|
|
|
<tr>
|
|
|
<td width="600px" colspan="4">合同号:${saleNo}</td>
|
|
|
- <td width="300px" colspan="2">日期:${saleDate}</td>
|
|
|
+ <td width="300px" colspan="2">日期:${saleDate.replace(
|
|
|
+ "T",
|
|
|
+ " "
|
|
|
+ )}</td>
|
|
|
</tr>
|
|
|
<tr align="center">
|
|
|
<td width="300px" colspan="2">客户名称:</td>
|
|
@@ -2293,7 +2323,10 @@ export default {
|
|
|
</tr>
|
|
|
<tr align="center">
|
|
|
<td colspan="2">预计下单时间:</td>
|
|
|
- <td colspan="2">${saleOrderEstimatedTime}</td>
|
|
|
+ <td colspan="2">${saleOrderEstimatedTime.replace(
|
|
|
+ "T",
|
|
|
+ " "
|
|
|
+ )}</td>
|
|
|
<td>交货周期:</td>
|
|
|
<td>${saleLeadTime}</td>
|
|
|
</tr>
|
|
@@ -2329,7 +2362,7 @@ export default {
|
|
|
}
|
|
|
// 计算小计
|
|
|
printStr += `
|
|
|
- <tr>
|
|
|
+ <tr align="center">
|
|
|
<td colspan="2">小计:</td>
|
|
|
<td>${amountTotal}</td>
|
|
|
<td>${singlTotal}</td>
|