diff --git a/favicon.ico b/favicon.ico
index 8f486dbb..8ec6528d 100644
Binary files a/favicon.ico and b/favicon.ico differ
diff --git a/src/api/PurchasingCenter/BuyerRequestFund.js b/src/api/PurchasingCenter/BuyerRequestFund.js
deleted file mode 100644
index 1e66716b..00000000
--- a/src/api/PurchasingCenter/BuyerRequestFund.js
+++ /dev/null
@@ -1,87 +0,0 @@
-import request from '@/utils/request'
-
-// 查询供应商
-export function searchSupplier(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8, check9, value9, check10, value10, check11, value11, check12, value12) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '采购管理_供应商_查询数据_根据条件',
- param: '供应商名称_check=' + check1 + '&供应商名称=' + value1 + '&企业性质_check=' + check2 + '&企业性质=' + value2 + '&创立日期_check=' + check3 + '&创立日期=' + value3 + '&注册资本_check=' + check4 + '&注册资本=' + value4 + '&税号_check=' + check5 + '&税号=' + value5 + '&电子信箱_check=' + check6 + '&电子信箱=' + value6 + '&地址_check=' + check7 + '&地址=' + value7 + '&帐号_check=' + check8 + '&帐号=' + value8 + '&开户行_check=' + check9 + '&开户行=' + value9 + '&电话号码_check=' + check10 + '&电话号码=' + value10 + '&传真_check=' + check11 + '&传真=' + value11 + '&货期_check=' + check12 + '&货期=' + value12
- }
- })
-}
-// 查询表1
-export function searchTable1(pageCurrent, pageSize, check1, start, end, check2, num1, check3, name1, check4, name2) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '采购管理_请款表_查询数据',
- param: '时间段_check=' + check1 + '&开始时间=' + start + '&结束时间=' + end + '&合同号_check=' + check2 + '&采购合同编号=' + num1 + '&采购员_check=' + check3 + '&采购员流水号=' + name1 + '&供应商_check=' + check4 + '&供应商名称=' + name2,
- Pagination: pageCurrent + '&' + pageSize
- }
- })
-}
-// 请款
-export function requestFund(num1, money, time, id) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '2',
- name: '采购管理_请款表_增加数据',
- param: `采购合同流水号=${num1}&请款金额=${money}&请款人=${id}&请款时间=${time}`
- }
- })
-}
-// 查询请款付款情况
-export function searchCondition(num1) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '采购管理_请款表_查询数据_已请款',
- param: '采购合同流水号=' + num1
- }
- })
-}
-// 取消请款
-export function cancelRequestFund(num1) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '2',
- name: '采购管理_请款表_删除数据',
- param: '采购科请款流水号=' + num1
- }
- })
-}
-// 查询请款表
-export function searchRequestTable(check, start, end) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '采购管理_请款表_查询数据_请款Excel',
- param: '请款时间段_check=' + check + '&开始时间=' + start + '&结束时间=' + end
- }
- })
-}
-// 初始化采购员 考核部门编号:采购部改16
-export function initBuyer() {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
- param: '考核部门编号=16'
- }
- })
-}
diff --git a/src/api/PurchasingCenter/ContractChange.js b/src/api/PurchasingCenter/ContractChange.js
deleted file mode 100644
index f3da87d8..00000000
--- a/src/api/PurchasingCenter/ContractChange.js
+++ /dev/null
@@ -1,121 +0,0 @@
-import request from '@/utils/request'
-
-// 初始化合同号
-export function initContract() {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '采购管理_采购合同_查询_采购部采购'
- }
- })
-}
-// 初始化采购员(考核部门编号:采购部:16)
-export function initBuyer() {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
- param: '考核部门编号=16'
- }
- })
-}
-// 采购合同查询
-export function searchTable1(pageCurrent, pageSize, check1, start, end, check2, contract, check3, name, check4, supplier) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '采购管理_合同_查询数据_采购部采购',
- param: '时间段_check=' + check1 + '&开始时间=' + start + '=datetime&结束时间=' + end + '=datetime&采购合同流水号_check=' + check2 + '&采购合同流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier,
- Pagination: pageCurrent + '&' + pageSize
- }
- })
-}
-// 采购合同明细查询
-export function searchTable2(num) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '采购管理_采购合同明细_查询数据',
- param: '采购合同流水号=' + num
- }
- })
-}
-// 采购合同变更
-export function contractChange(num, reason) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '2',
- name: '采购管理_采购合同变更_增加数据',
- param: '采购合同流水号=' + num + '&合同变更原因=' + reason
- }
- })
-}
-// 查询变更合同
-export function searchChangeContract(pageCurrent, pageSize, check1, start, end, check2, contract, check3, person, check4, supplier, check5, project, check6, payType) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '采购管理_采购合同变更_查询数据_根据条件_cjn',
- param: '时间段_check=' + check1 + '&开始时间=' + start + '=datetime&结束时间=' + end + '=datetime&采购合同流水号_check=' + check2 + '&采购合同流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + person + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier + '&项目流水号_check=' + check5 + '&项目流水号=' + project + '&付款方式流水号_check=' + check6 + '&付款方式流水号=' + payType,
- Pagination: pageCurrent + '&' + pageSize
- }
- })
-}
-// 初始化变更合同号
-export function initChangeContract() {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '采购管理_采购合同变更_查询_cjn'
- }
- })
-}
-// 采购变更合同明细查询
-export function searchTable4(num) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '采购管理_采购合同明细变更_查询数据',
- param: '采购合同变更流水号=' + num
- }
- })
-}
-// 初始化付款方式
-export function initPayMethod() {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '采购管理_付款方式_查询数据'
- }
- })
-}
-// 合同作废
-export function deleteContract(num) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '2',
- name: '采购管理_采购合同_删除数据',
- param: `采购合同流水号=${num}`
- }
- })
-}
diff --git a/src/api/PurchasingCenter/ContractStateSearch.js b/src/api/PurchasingCenter/ContractStateSearch.js
deleted file mode 100644
index 603e9cfa..00000000
--- a/src/api/PurchasingCenter/ContractStateSearch.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import request from '@/utils/request'
-
-// 初始化项目(车间传递来的)
-export function initProject() {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: 'PDM_项目名称_采购部采购_查询数据'
- }
- })
-}
-// 初始化采购员 考核部门编号:采购部16
-export function initBuyer() {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
- param: '考核部门编号=16'
- }
- })
-}
-// 查询表1
-export function searchTable1(pageCurrent, pageSize, check1, num1, check2, name, check3, num2, state) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '采购管理_采购部采购_采购情况查询',
- param: `项目流水号_check=${check1}&项目流水号=${num1}&物料名称_check=${check2}&物料名称=${name}&人员编号_check=${check3}&人员编号=${num2}&采购情况=${state}`,
- Pagination: pageCurrent + '&' + pageSize
- }
- })
-}
diff --git a/src/api/PurchasingCenter/CreateContract.js b/src/api/PurchasingCenter/CreateContract.js
deleted file mode 100644
index 32a54969..00000000
--- a/src/api/PurchasingCenter/CreateContract.js
+++ /dev/null
@@ -1,97 +0,0 @@
-import request from '@/utils/request'
-
-// 查询询价单列表 表1
-export function searchInquirySheet(check1, value1, check2, value2, check3, id) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '采购管理_询价单_查询数据',
- param: `供应商名称_check=${check1}&供应商名称=${value1}&询价单编号_check=${check2}&询价单编号=${value2}&采购员流水号_check=${check3}&采购员流水号=${id}`
- }
- })
-}
-// 根据询价单流水号查询物料详情
-export function searchSheetContract(num1) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '采购管理_询价单明细_查询数据_根据询价单',
- param: '询价单流水号=' + num1
- }
- })
-}
-// 查询合同模板
-export function searchContractDemo(num1 = null) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '采购管理_合同模板_查询数据',
- param: '合同模板流水号=' + num1
- }
- })
-}
-// 初始化付款方式
-export function initPayMethod() {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '采购管理_付款方式_查询数据'
- }
- })
-}
-// 初始化付款时间节点
-export function initPayTimeNode() {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '采购管理_付款时间节点_查询数据'
- }
- })
-}
-// 生成采购合同
-export function doneContract(num1, name1, time1, time2, method, num2, text, freight, num3, numGroup, priceGroup, dayGroup, payGroup, planGroup, taxGroup, currency, cala, weight, id, groupPartGroup) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '2',
- name: '采购管理_采购合同_增加数据',
- param: `采购合同编号=${num1}&采购合同名称=${name1}&预到货时间=${time1}&规定到货时间=${time2}&付款方式=${method}&采购员=${id}&供应商流水号=${num2}&合同文本=${text}&运费=${freight}&物料流水号组=${num3}&数量组=${numGroup}&单价组=${priceGroup}&发货天数组=${dayGroup}&付款比例组=${payGroup}&计划付款时间组=${planGroup}&税率组=${taxGroup}&币种流水号组=${currency}&采购合同计算方式流水号组=${cala}&重量组=${weight}&组件零件流水号组=${groupPartGroup}`
- }
- })
-}
-// 生成采购合同
-export function insertFile(name, num) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '2',
- name: '采购管理_图片附件_增加数据',
- param: `文件名=${name}&采购合同编号=${num}`
- }
- })
-}
-
-// 生成采购合同
-export function searchFile(num) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '采购管理_图片附件_查询数据',
- param: `采购合同编号=${num}`
- }
- })
-}
diff --git a/src/api/PurchasingCenter/InvoiceStateSearch.js b/src/api/PurchasingCenter/InvoiceStateSearch.js
deleted file mode 100644
index 9d5be917..00000000
--- a/src/api/PurchasingCenter/InvoiceStateSearch.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import request from '@/utils/request'
-
-// 发票合同
-export function searchContractInvoice(pageCurrent, pageSize, check1, num, check2, name) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '采购管理_到票情况_查询数据',
- param: `采购合同流水号_check=${check1}&采购合同流水号=${num}&供应商名称_check=${check2}&供应商名称=${name}`,
- Pagination: pageCurrent + '&' + pageSize
- }
- })
-}
-// 发票查询
-export function searchInvoice(num) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '采购管理_发票_查询数据',
- param: '采购合同流水号_check=1&采购合同流水号=' + num
- }
- })
-}
-// 传送人接收人初始化 采购科改16
-export function initPerson() {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
- param: '考核部门编号=16'
- }
- })
-}
-// 初始化合同号
-export function initContract() {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '采购管理_付款情况_查询数据'
- }
- })
-}
diff --git a/src/api/PurchasingCenter/PurchaseBudgetSearch.js b/src/api/PurchasingCenter/PurchaseBudgetSearch.js
deleted file mode 100644
index 606932b9..00000000
--- a/src/api/PurchasingCenter/PurchaseBudgetSearch.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import request from '@/utils/request'
-
-// 初始化合同
-export function initContract() {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '采购管理_付款情况_查询数据'
- }
- })
-}
-// 查询合同付款时间节点
-export function searchPayTimeNode(pageCurrent, pageSize, check1, num, check2, name) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '采购管理_采购预算_合同付款时间节点_查询数据',
- param: `采购合同流水号_check=${check1}&采购合同流水号=${num}&供应商名称_check=${check2}&供应商名称=${name}`,
- Pagination: pageCurrent + '&' + pageSize
- }
- })
-}
-// 查询合同付款时间节点及金额
-export function searchPayTimeNodeMoney(num) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '采购管理_采购预算_合同付款时间节点及金额_查询数据',
- param: `采购合同流水号=${num}`
- }
- })
-}
-// 设置合同付款时间节点其他
-export function editPayTimeNodeOther(num, date1, date2, date3, date4, date5) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '2',
- name: '采购管理_合同付款时间节点_其他_修改数据',
- param: `采购合同流水号=${num}&项目预验收日期=${date1}&项目终验收日期=${date2}&发货日期=${date3}&货到用户现场日期=${date4}&用户现场开通日期=${date5}`
- }
- })
-}
-// 查询采购预算
-export function searchPurchaseBudget(check, date1, date2) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '采购管理_采购预算_查询数据',
- param: `时间段_check=${check}&开始时间=${date1}&结束时间=${date2}`
- }
- })
-}
diff --git a/src/api/PurchasingCenter/PurchaseContractSearch.js b/src/api/PurchasingCenter/PurchaseContractSearch.js
index fe32df30..397da60f 100644
--- a/src/api/PurchasingCenter/PurchaseContractSearch.js
+++ b/src/api/PurchasingCenter/PurchaseContractSearch.js
@@ -47,3 +47,15 @@ export function searchTable2(num) {
}
})
}
+// 删除采购合同
+export function deleteContract(num) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '采购管理_采购合同_删除_采购部采购',
+ param: '采购合同流水号=' + num
+ }
+ })
+}
diff --git a/src/api/PurchasingCenter/ReceiptConnectionSheet.js b/src/api/PurchasingCenter/ReceiptConnectionSheet.js
deleted file mode 100644
index 24c00416..00000000
--- a/src/api/PurchasingCenter/ReceiptConnectionSheet.js
+++ /dev/null
@@ -1,86 +0,0 @@
-import request from '@/utils/request'
-
-// 发票查询
-export function searchInvoice(pageCurrent, pageSize, check1, num1, check2, time, check3, transmit, check4, recipient, check5, num2) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '采购管理_发票_查询数据',
- param: '发票号_check=' + check1 + '&发票号=' + num1 + '&开票时间_check=' + check2 + '&开票时间=' + time + '&传送人_check=' + check3 + '&传送人=' + transmit + '&接收人_check=' + check4 + '&接收人=' + recipient + '&采购合同流水号_check=' + check5 + '&采购合同流水号=' + num2,
- Pagination: pageCurrent + '&' + pageSize
- }
- })
-}
-// 发票增加
-export function addInvoice(num1, num2, time1, money, send, receive, remark, time2) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '2',
- name: '采购管理_发票_增加数据',
- param: '采购合同流水号=' + num1 + '&发票号=' + num2 + '&开票时间=' + time1 + '&开票金额=' + money + '&传送人=' + send + '&接收人=' + receive + '&备注=' + remark + '&操作时间=' + time2 + '&identity_receiptLiushuihao=1=int=output'
- }
- })
-}
-// 发票编辑
-export function editInvoice(num1, num2, num3, time1, money, send, receive, remark) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '2',
- name: '采购管理_发票_修改数据',
- param: '发票流水号=' + num1 + '&采购合同流水号=' + num2 + '&发票号=' + num3 + '&开票时间=' + time1 + '&开票金额=' + money + '&传送人=' + send + '&接收人=' + receive + '&备注=' + remark
- }
- })
-}
-// 发票删除
-export function deleteInvoice(num1) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '2',
- name: '采购管理_发票_删除数据',
- param: '发票流水号=' + num1
- }
- })
-}
-// 传送人初始化 采购科改16
-export function initSender() {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
- param: '考核部门编号=16'
- }
- })
-}
-// 接收人初始化 财务部7
-export function initReceiver() {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
- param: '考核部门编号=7'
- }
- })
-}
-// 初始化合同号
-export function initContract() {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '1',
- name: '采购管理_付款情况_查询数据'
- }
- })
-}
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/ManufacturingCenter/ProcessingStatusEdit/index.vue b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
index f043dcba..8debe709 100644
--- a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
@@ -683,7 +683,23 @@ export default {
}
-
-
diff --git a/src/views/MarketingCenter/DeliveryManagement/index.vue b/src/views/MarketingCenter/DeliveryManagement/index.vue
index 6029c209..cd3b38dc 100644
--- a/src/views/MarketingCenter/DeliveryManagement/index.vue
+++ b/src/views/MarketingCenter/DeliveryManagement/index.vue
@@ -298,7 +298,7 @@
➡
- ⬅
+ ⬅
@@ -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) {
diff --git a/src/views/PurchasingCenter/BuyerRequestFund/index.vue b/src/views/PurchasingCenter/BuyerRequestFund/index.vue
deleted file mode 100644
index 34ac1431..00000000
--- a/src/views/PurchasingCenter/BuyerRequestFund/index.vue
+++ /dev/null
@@ -1,431 +0,0 @@
-
-
-
- 开始时间:
-
- 结束时间:
-
- 合同号:
-
- 采购员:
-
-
-
- 供应商:
-
- 查询
-
-
-
-
-
-
- 请款
-
-
-
-
- {{ scope.row.采购合同编号 }}
-
-
-
-
- {{ scope.row.采购合同名称 }}
-
-
-
-
- {{ scope.row.规定到货时间.split(' ')[0] }}
-
-
-
-
- {{ 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.未付款原因 }}
-
-
-
-
-
-
-
-
-
-
-
-
- 请款时间区间:
-
- ~
-
- 查询
- 导出Excel
-
-
-
-
-
-
- {{ scope.row.采购合同编号 }}
-
-
-
-
- {{ scope.row.采购合同名称 }}
-
-
-
-
- {{ scope.row.规定到货时间.split(' ')[0] }}
-
-
-
-
- {{ scope.row.供应商名称 }}
-
-
-
-
- {{ scope.row.总金额 }}
-
-
-
-
- {{ scope.row.付款方式内容 }}
-
-
-
-
- {{ scope.row.欠款金额 }}
-
-
-
-
- {{ scope.row.姓名 }}
-
-
-
-
- {{ scope.row.请款金额 }}
-
-
-
-
- {{ scope.row.请款时间.split(' ')[0] }}
-
-
-
-
-
-
-
-
-
-
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 }} |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/PurchasingCenter/ContractStateSearch/index.vue b/src/views/PurchasingCenter/ContractStateSearch/index.vue
deleted file mode 100644
index 4467c13e..00000000
--- a/src/views/PurchasingCenter/ContractStateSearch/index.vue
+++ /dev/null
@@ -1,221 +0,0 @@
-
-
-
- 项目名称:
-
-
-
- 物料名称:
-
- 采购员:
-
-
-
- 采购情况:
-
-
-
- 查询
-
-
-
-
-
-
- 未分配
- 未询价
- 已询价
- 已采购
-
-
-
-
- {{ scope.row.物料名称 }}
-
-
-
-
- {{ scope.row.物料型号 }}
-
-
-
-
- {{ scope.row.物料规格 }}
-
-
-
-
- {{ scope.row.零件数量 }}
-
-
-
-
- {{ scope.row.项目名称 }}
-
-
-
-
- {{ scope.row.物料计划到货时间.split(' ')[0] }}
-
-
-
-
- {{ scope.row.姓名 }}
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/PurchasingCenter/CreateContract/index.vue b/src/views/PurchasingCenter/CreateContract/index.vue
deleted file mode 100644
index 788a34fd..00000000
--- a/src/views/PurchasingCenter/CreateContract/index.vue
+++ /dev/null
@@ -1,597 +0,0 @@
-
-
-
-
-
-
-
-
-
- {{ item.label }}
- {{ item.supplierName }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.参考价格 }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.物料计划到货时间.split(' ')[0] }}
-
-
-
-
- {{ scope.row.物料名称 }}
-
-
-
-
- {{ scope.row.物料型号 }}
-
-
-
-
- {{ scope.row.零件数量 }}
-
-
-
-
- {{ scope.row.订货数量 }}
-
-
-
-
- {{ scope.row.金额 }}
-
-
-
- 计算合同总额
- 合同总额:
-
-
-
-
-
-
-
- {{ scope.row.合同模板名称 }}
-
-
-
-
-
-
- 添加图纸附件
- 生成采购合同
-
-
-
-
-
-
-
-
-
diff --git a/src/views/PurchasingCenter/FundApproval1/index.vue b/src/views/PurchasingCenter/FundApproval1/index.vue
deleted file mode 100644
index 4309e6b5..00000000
--- a/src/views/PurchasingCenter/FundApproval1/index.vue
+++ /dev/null
@@ -1,304 +0,0 @@
-
-
-
-
-
-
- {{ 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.请款金额 }}
-
-
-
- 查看详情
-
- 通过
- 不通过
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/PurchasingCenter/InvoiceStateSearch/index.vue b/src/views/PurchasingCenter/InvoiceStateSearch/index.vue
deleted file mode 100644
index c997aafd..00000000
--- a/src/views/PurchasingCenter/InvoiceStateSearch/index.vue
+++ /dev/null
@@ -1,224 +0,0 @@
-
-
-
- 采购合同号:
-
-
- {{ 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.备注 }}
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue
index b95aa9cf..3f0cf9ea 100644
--- a/src/views/PurchasingCenter/OfflineContract/index.vue
+++ b/src/views/PurchasingCenter/OfflineContract/index.vue
@@ -422,7 +422,7 @@
- 离线合同 |
+ 离线合同 |
| GAOJING |
diff --git a/src/views/PurchasingCenter/PurchaseBudgetSearch/index.vue b/src/views/PurchasingCenter/PurchaseBudgetSearch/index.vue
deleted file mode 100644
index ef1d60c1..00000000
--- a/src/views/PurchasingCenter/PurchaseBudgetSearch/index.vue
+++ /dev/null
@@ -1,397 +0,0 @@
-
-
-
- 时间段:
-
- 查询
-
-
-
-
-
-
- {{ 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) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/PurchasingCenter/PurchaseContractApproval/index.vue b/src/views/PurchasingCenter/PurchaseContractApproval/index.vue
index 944bf4ed..6a913066 100644
--- a/src/views/PurchasingCenter/PurchaseContractApproval/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractApproval/index.vue
@@ -193,6 +193,7 @@ export default {
},
created() {
this.fetchData()
+ this.searchTable1()
},
methods: {
fetchData() {
diff --git a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
index 753d5b8a..87ba806b 100644
--- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
@@ -22,6 +22,8 @@
{{ item.name }}
+ 供应商:
+
采购员:
- 供应商:
-
审批情况:
-
+
-
+
- 未审批
- 通过审批
- 不通过审批
+ 未审批
+ 已通过
+ 未通过
@@ -111,7 +111,7 @@
{{ scope.row.采购合同名称 }}
-
+
{{ scope.row.供应商名称 }}
@@ -131,6 +131,11 @@
{{ scope.row.未通过原因 }}
+
+
+ 删除
+
+
-
-