n^FP%?8)LHJQe!=A5&TD=TZcK~DVIt@u7^1_d1MHNvwzr{kL`gqB2B>qeFlX#*zH|3GVUGDL$}XDwaY)2h!%
zYwcLIhiy22R<#`+NpEWZirNjt9fBzFw?#eksX6XWS|Vr=q@na
zU%k&l+%QlLS@`ZFCA-Sm4x9D)5V28j#EuE$iItkLy0J2trTnTLuEqg#kITcln+9CA
zo2{uB%4&3XhJ4s>lVH=i@nWCj)7;EUDw<0-k(1OO~_r+@==WI8gXx;
ziR39`(nu~7zg=v`xT~@Hx}e|S;hM^#f`KN2O-#Yj3DRaXnbLDdY}5xteJ>XulT*YV
zdpn9)h}nqd1BTxj=;^`p83t8dRWX_ApDj$;aIft7tEhv
zES;|39kyYm=+SmF+_v5zM>L~S69&H;2$dm7MWDB3Hc6Ns7-AWx2Yw|RHKT+c38F|oOT9jitVE5|SK@ssrnga62_G#1vhQL;G
zqpKS2{N=N0>t%$1|1)C#O5PWAvq;o&bK}PUP*&vUqGG1T0YA+(tY7NIz1mtCu`sG=Xj8A}n
z)E~b4*?;I5Jr+Dbl4$Wtu)e`zK@=5Xg)791U8
z5E)PBH8h4h#@m=4P@UP!423drhcr|M+!tbxqTH{WM~v9?2GA`79sq<&7$W3F5)I1p
z6EmR*-an5WQ^cmOFs}kF<%!#W#FK<61Q3ytluITi7)q3=}b(=a;;IkjNZ=iHD;~
z;--emxp3{wK!WJ5$acP+WsFvI-yiD!Q$v8j0rH3d2;IDRLO@tFsss72V-LdjZ}=XO
zh_HRSO@If)FkmW2AQY@MP=~A&ZV;x?2mtGegSlr)CrorkpydV(^&vdzcM*D+_y<9O
zhcngPh$yJVn`#V0eDLKs<`+e9{<}vX4{l6eULJ;3)DM+|K?Qu?@1y4^Ra3HOwrA|D
zoFa4;XvR=a0qUkT*HaR8
zaT_?x(c*W8`6I*eh%$m?Fx-ZT+pFAg?_8U!CLs}QmsLieNxIR=?V~xis<`{ZdB>Y$
zOZ&i&I*`EyDs^`EHh|o8ltUVeLv8&;xdcRcojPuxj<0>*v2GI#mIAxIOvY0rH+~|1lVJtbH8emC&M&`ug9S0-iLhn~Oh{Di*!H1hSVMp$x&5ZqnW8
z@n!iPXD9p}=9&j08#ifbboyuZM7{)OEgp9!USju=>P0)gv)ni>5mM#Q#eev77Bc7s
z!{b9~I3Y(CXU7{Mi2>A=D(dPYH1RtRq08Le!6=CLAT2G*l>Zm1237g0go^@TLtvJr
z5J}1B_flP51C5Rj^Sy(?AUjKCas|mGpc4ieoN}q0m3^V)Ls~_`1qmjR61e^g
zsyhk_Qe#6y6|Mz$1N>(f}
zFbE)3ptC{Of}{l~!H7jtuE}D&XzSYZ2fw~)ox^G}SAz3jRZ&BENhT$g%3t;Qd_P|8
z{-}k3XjyfvcU}xtYQ`qc{zRpa9ROI~K5~@mYHJE6dkjq!bG-E-dk1#^!pC{lQ0c>U1}i+U?|UjIjiRa}!}6Y-Px)1X$uhkh|xZ^?ZTyxn=~Wp|nF%Ap2Kz)WW%fetW)UC?p5~
zi8z_x4?7k*!U$mB2Jm
zDrFRlq9SymbRyqVN(?N34L?JFgG&I1$z);YDz#Z&uc9yvFkv)L3KQlg#ti`G%Nw2^D|WhH5kAWX=wO&Jb^%Rnkp+%L&{BM
zrFH^G%xWnjuXlFNgP!NuAr9zEU|Ya4Lsb@hqGK5pcpRu31#1*~VKf{elcms4+db`O
z#=+F&BpFQxuo4y&&Ur6@WGU}(S%CG<2fOB)>pnK-7{6Vs(jJ(aa+={fz_uqU7NeMM
zb#*1x)z`Cg6xCn0Zrj5D#v%M-0$6Za0HE*4F7OT%b1lY3^C@|0bX@{miJ
z#MStnD*`Mr5OsBpH?_31eBL!Z^}d1r0lnRB<1h~nNH2tMuziYc5x_&mV(2-@9LCS6
z5k#R-&d>F=&OpXX7l9alpJ7cYHDE5JAem?1g;Vi
z6JY%b0w7!*I8bCCh5{r{Sw$)H#YB-_NISSgKx5HpRA7!KOG?Tja=FYiIqCGawzf~X
zJ+ntjiYp&o1JdH5wJL%2&euS~=i$RguZyP>+qZ1oWa{tlla!X0+I)eaJ{k#0bb14m
z)njwL6>Dm$SrZ>0pU75JRwn&{U`DIf➡
- ⬅
+ ⬅
@@ -314,8 +314,8 @@
:label="item.label"
:value="item.value"/>
- 增加
- 删除
+ 增加
+ 删除
-
+
{
this.getSelect(searchCargoBox, ['货箱号', '货箱号编号'], 'cargoBox', this.invoiceNum)
+ this.运输状态 === '已签收' ? this.disabledremoveInto = true : this.disabledremoveInto = false
+ this.运输状态 === '已签收' ? this.disabledmoveInto = true : this.disabledmoveInto = false
+ this.运输状态 === '已签收' ? this.btnAdd = true : this.btnAdd = false
+ this.运输状态 === '已签收' ? this.btnDel = true : this.btnDel = false
})
})
},
@@ -1040,6 +1053,10 @@ export default {
}
}).then(() => {
this.getSelect(searchCargoBox, ['货箱号', '货箱号编号'], 'cargoBox', this.invoiceNum)
+ this.运输状态 === '已签收' ? this.disabledremoveInto = true : this.disabledremoveInto = false
+ this.运输状态 === '已签收' ? this.disabledmoveInto = true : this.disabledmoveInto = false
+ this.运输状态 === '已签收' ? this.btnAdd = true : this.btnAdd = false
+ this.运输状态 === '已签收' ? this.btnDel = true : this.btnDel = false
})
})
},
diff --git a/src/views/MarketingCenter/InvoiceRecord/index.vue b/src/views/MarketingCenter/InvoiceRecord/index.vue
index c3d4b0eb..9042a2ab 100644
--- a/src/views/MarketingCenter/InvoiceRecord/index.vue
+++ b/src/views/MarketingCenter/InvoiceRecord/index.vue
@@ -416,17 +416,20 @@ export default {
this.tableData1 = data.rows
this.total = data.total
})
+ this.tableData2 = []
},
// 项目信息表格改变每页显示条数
handleSizeChange(val) {
this.PageCurrent = 1
this.PageSize = val
this.fetchTableData1()
+ this.tableData2 = []
},
// 项目信息表格翻页
handleCurrentChange(val) {
this.PageCurrent = val
this.fetchTableData1()
+ this.tableData2 = []
},
// 查询开票记录表格
fetchTableData2(row) {
From eb70652ccab4e44c0608e1dc347c8c2a07dec2e3 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Mon, 24 Dec 2018 14:47:40 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E5=A4=87=E6=96=99=E5=8D=95=E5=AF=BC?=
=?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/vendor/exportExcel.js | 13 ++++-----
.../CreatePreparationBill/exportExcel.js | 20 ++++++++++++++
.../CreatePreparationBill/index.vue | 27 ++++++++++++-------
3 files changed, 45 insertions(+), 15 deletions(-)
create mode 100644 src/views/ManufacturingCenter/CreatePreparationBill/exportExcel.js
diff --git a/src/vendor/exportExcel.js b/src/vendor/exportExcel.js
index 43ec8c71..ee3824a6 100644
--- a/src/vendor/exportExcel.js
+++ b/src/vendor/exportExcel.js
@@ -12,12 +12,6 @@ export function getExplorer() {
return 'Safari'
}
}
-export function method5(tableid) {
- tableToExcel(tableid)
-}
-export function Cleanup() {
- window.clearInterval(idTmr)
-}
const tableToExcel = (function() {
const uri = 'data:application/vnd.ms-excel;base64,'
const template = `{worksheet}`
@@ -37,3 +31,10 @@ const tableToExcel = (function() {
}
})()
+export function method5(tableid) {
+ tableToExcel(tableid)
+}
+export function Cleanup() {
+ window.clearInterval(idTmr)
+}
+
diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/exportExcel.js b/src/views/ManufacturingCenter/CreatePreparationBill/exportExcel.js
new file mode 100644
index 00000000..22925cee
--- /dev/null
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/exportExcel.js
@@ -0,0 +1,20 @@
+// 导出Excel方法（表格id，不加扩展名的文件名，sheet名）
+export function exportExcelMethod(tableId, fileName, sheetName) {
+ tableToExcel(tableId, fileName, sheetName)
+ return 1
+}
+const tableToExcel = (function() {
+ const uri = 'data:application/vnd.ms-excel;base64,'
+ // 设置导出表格的单元格默认高度/宽度/边框样式/字体颜色/背景颜色/居中，网页显示表格宽度建议1240，tr/td视情况而定
+ const template = `{worksheet}`
+ const base64 = function(s) { return window.btoa(unescape(encodeURIComponent(s))) }
+ const format = function(s, c) { return s.replace(/{(\w+)}/g, function(m, p) { return c[p] }) }
+ return function(table, filename, sheetname) {
+ if (!table.nodeType) table = document.getElementById(table)
+ const ctx = { worksheet: sheetname || 'Worksheet', table: table.innerHTML }
+ const aTag = document.createElement('a')
+ aTag.href = uri + base64(format(template, ctx))
+ aTag.download = filename
+ aTag.click()
+ }
+})()
diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
index 03466263..dae8ca1b 100644
--- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
@@ -6,7 +6,8 @@
查询
查询全部
- 导出备料单
+ 导出备料单
+ 导出完成
@@ -78,10 +79,11 @@
-
-
diff --git a/src/views/PurchasingCenter/ContractChange/index.vue b/src/views/PurchasingCenter/ContractChange/index.vue
deleted file mode 100644
index 5a587a48..00000000
--- a/src/views/PurchasingCenter/ContractChange/index.vue
+++ /dev/null
@@ -1,647 +0,0 @@
-
-
-
-
-
-
- 时间段:
-
- 合同号:
-
-
- {{ item.label }}
- {{ item.name }}
-
-
- 采购员:
-
-
-
-
-
- 供应商:
-
- 查询新合同
- 变更原因:
-
- 合同变更
-
-
-
-
- {{ scope.row.采购合同编号 }}
-
-
-
-
- {{ scope.row.采购合同名称 }}
-
-
-
-
- {{ scope.row.供应商名称 }}
-
-
-
-
- {{ scope.row.规定到货时间.split(' ')[0] }}
-
-
-
-
- {{ scope.row.姓名 }}
-
-
-
-
- {{ scope.row.总金额 }}
-
-
-
-
- {{ scope.row.付款方式内容 }}
-
-
-
-
- 作废
-
-
-
-
-
-
-
-
-
- | GAOJING |
- 产品销售合同 |
-
-
- | 需方 |
- 江苏高精机电装备有限公司 |
- 合同编号 |
- {{ contract01 }} |
-
-
- | 供方 |
- {{ supplier01 }} |
- 签订地点 |
- 江苏盐城 |
-
-
- 一、 产品名称、型号、数量、单价、品牌：
-
-
-
- | 物料名称 |
- 物料规格 |
- 物料型号 |
- 发货天数 |
- 数量 |
- 单价 |
- 总价 |
-
-
-
-
- | 运费： |
- {{ freight01 }} |
-
-
- | 总价: (人民币){{ RMB01 }}(含0.17增值税) |
- {{ TotalAmount01 }} |
-
-
-
-
-
-
-
-
-
-
-
- 时间段:
-
- 合同号:
-
-
- {{ item.label }}
- {{ item.name }}
-
-
- 采购员:
-
-
-
-
-
- 供应商:
-
- 查询旧合同
-
-
-
-
- {{ scope.row.采购合同编号 }}
-
-
-
-
- {{ scope.row.采购合同名称 }}
-
-
-
-
- {{ scope.row.供应商名称 }}
-
-
-
-
- {{ scope.row.规定到货时间 }}
-
-
-
-
- {{ scope.row.姓名 }}
-
-
-
-
- {{ scope.row.总金额 }}
-
-
-
-
- {{ scope.row.付款方式内容 }}
-
-
-
-
- {{ scope.row.更改标记 }}
-
-
-
-
- {{ scope.row.合同变更原因 }}
-
-
-
-
-
-
-
-
-
- | GAOJING |
- 产品销售合同 |
-
-
- | 需方 |
- 江苏高精机电装备有限公司 |
- 合同编号 |
- {{ contract02 }} |
-
-
- | 供方 |
- {{ supplier02 }} |
- 签订地点 |
- 江苏盐城 |
-
-
- 一、 产品名称、型号、数量、单价、品牌：
-
-
-
- | 物料名称 |
- 物料规格 |
- 物料型号 |
- 发货天数 |
- 数量 |
- 单价 |
- 总价 |
-
-
-
-
- | 运费： |
- {{ freight02 }} |
-
-
- | 总价: (人民币){{ RMB02 }}(含0.17增值税) |
- {{ TotalAmount02 }} |
-
-
-
-
-
-
-
-
-
-
- 项目名称:
-
-
-
- 物料名称:
-
- 采购员:
-
-
-
- 采购情况:
-
-
-
- 查询
-
-
-
-
-
-
- 未分配
- 未询价
- 已询价
- 已采购
-
-
-
-
- {{ scope.row.物料名称 }}
-
-
-
-
- {{ scope.row.物料型号 }}
-
-
-
-
- {{ scope.row.物料规格 }}
-
-
-
-
- {{ scope.row.零件数量 }}
-
-
-
-
- {{ scope.row.项目名称 }}
-
-
-
-
- {{ scope.row.物料计划到货时间.split(' ')[0] }}
-
-
-
-
- {{ scope.row.姓名 }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.label }}
- {{ item.supplierName }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.参考价格 }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.物料计划到货时间.split(' ')[0] }}
-
-
-
-
- {{ scope.row.物料名称 }}
-
-
-
-
- {{ scope.row.物料型号 }}
-
-
-
-
- {{ scope.row.零件数量 }}
-
-
-
-
- {{ scope.row.订货数量 }}
-
-
-
-
- {{ scope.row.金额 }}
-
-
-
- 计算合同总额
- 合同总额:
-
-
-
-
-
-
-
- {{ scope.row.合同模板名称 }}
-
-
-
-
-
-
- 添加图纸附件
- 生成采购合同
-
-
-
-
-
-
-
-
- {{ scope.row.采购合同编号 }}
-
-
-
-
- {{ scope.row.采购合同名称 }}
-
-
-
-
- {{ scope.row.规定到货时间.split(' ')[0] }}
-
-
-
-
- {{ scope.row.供应商名称 }}
-
-
-
-
- {{ scope.row.付款方式内容 }}
-
-
-
-
- {{ scope.row.姓名 }}
-
-
-
-
- {{ scope.row.总金额 }}
-
-
-
-
- {{ scope.row.欠款金额 }}
-
-
-
-
- {{ scope.row.已付金额 }}
-
-
-
-
- {{ scope.row.请款金额 }}
-
-
-
-
- 通过
- 不通过
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.供应商名称 }}
-
-
-
-
- {{ scope.row.请款时间 }}
-
-
-
-
- {{ scope.row.姓名 }}
-
-
-
-
- {{ scope.row.请款金额 }}
-
-
-
-
-
-
-
-
-
- {{ scope.row.离线合同编号 }}
-
-
-
-
- {{ scope.row.请款金额 }}
-
-
-
- 查看详情
-
- 通过
- 不通过
-
-
-
-
-
-
-
-
-
-
- 采购合同号:
-
-
- {{ item.label }}
- {{ item.name }}
-
-
- 供应商:
-
- 查询
-
-
-
-
-
-
- {{ scope.row.采购合同编号 }}
-
-
-
-
- {{ scope.row.采购合同名称 }}
-
-
-
-
- {{ scope.row.供应商名称 }}
-
-
-
-
- {{ Number(scope.row.合同总金额).toFixed(2) }}
-
-
-
-
- {{ Number(scope.row.到票总金额).toFixed(2) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.发票号 }}
-
-
-
-
- {{ scope.row.开票时间 }}
-
-
-
-
- {{ scope.row.开票金额 }}
-
-
-
-
- {{ scope.row.传送人姓名 }}
-
-
-
-
- {{ scope.row.接收人姓名 }}
-
-
-
-
- {{ scope.row.采购合同编号 }}
-
-
-
-
- {{ scope.row.备注 }}
-
-
-
-
-
-
- 时间段:
-
- 查询
-
-
-
-
-
-
- {{ scope.row.采购合同编号 }}
-
-
-
-
- {{ scope.row.付款时间节点名称 }}
-
-
-
-
- {{ scope.row.预付时间.split(' ')[0] }}
-
-
-
-
- {{ scope.row.付款比例.toFixed(1) }}
-
-
-
-
- {{ scope.row.预付金额.toFixed(2) }}
-
-
-
-
-
-
- 合同号:
-
-
- {{ item.label }}
- {{ item.name }}
-
-
- 供应商:
-
- 查询
-
-
-
-
-
-
- {{ scope.row.采购合同编号 }}
-
-
-
-
- {{ scope.row.采购合同名称 }}
-
-
-
-
- {{ scope.row.供应商名称 }}
-
-
-
-
- {{ scope.row.付款方式内容 }}
-
-
-
-
- {{ scope.row.审批时间.split(' ')[0] }}
-
-
-
-
- {{ scope.row.规定到货时间.split(' ')[0] }}
-
-
-
-
- {{ scope.row.项目预验收日期.split(' ')[0] }}
-
-
-
-
- {{ scope.row.项目终验收日期.split(' ')[0] }}
-
-
-
-
- {{ scope.row.发货日期.split(' ')[0] }}
-
-
-
-
- {{ scope.row.货到用户现场日期.split(' ')[0] }}
-
-
-
-
- {{ scope.row.用户现场开通日期.split(' ')[0] }}
-
-
-
-
- 设置
-
-
-
-
-
-
-
-
-
- {{ scope.row.采购合同编号 }}
-
-
-
-
- {{ scope.row.付款时间节点名称 }}
-
-
-
-
- {{ scope.row.预付时间 ? scope.row.预付时间.split(' ')[0] : '参考时间节点未设置' }}
-
-
-
-
- {{ scope.row.付款比例.toFixed(1) }}
-
-
-
-
- {{ scope.row.预付金额.toFixed(2) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 发票号:
-
-
-
- 采购合同号:
-
-
- {{ item.label }}
- {{ item.name }}
-
-
- 传送人:
-
-
-
- 接收人:
-
-
-
- 查询
- 增加
- 导出
-
-
-
-
-
-
- {{ scope.row.发票号 }}
-
-
-
-
- {{ scope.row.开票时间 ? scope.row.开票时间 : '—' }}
-
-
-
-
- {{ scope.row.开票金额 }}
-
-
-
-
- {{ scope.row.采购合同编号 }}
-
-
-
-
- {{ scope.row.采购合同名称 }}
-
-
-
-
- {{ scope.row.供应商名称 }}
-
-
-
-
- {{ scope.row.总金额 }}
-
-
-
-
- {{ scope.row.传送人姓名 }}
-
-
-
-
- {{ scope.row.接收人姓名==='请选择' ? '—' : scope.row.接收人姓名 }}
-
-
-
-
- {{ scope.row.备注 ? scope.row.备注 : '—' }}
-
-
-
-
- 编辑
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.label }}
- {{ item.name }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-