From 2df8f34a7ff65c43a367f80e1c88a16b10fcb75b Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Tue, 3 Mar 2020 16:06:30 +0800
Subject: [PATCH 1/3] curd
---
src/utils/curd.js | 47 +++++++++++++++++++
.../maintainInformation/index.vue | 14 +++---
2 files changed, 53 insertions(+), 8 deletions(-)
diff --git a/src/utils/curd.js b/src/utils/curd.js
index 66817bfe..3ccfcb3b 100644
--- a/src/utils/curd.js
+++ b/src/utils/curd.js
@@ -7,6 +7,52 @@ export default {
console.log(param, 1)
download(`${ExcelDownLoad}?param=${param}`)
}
+ // 用于生成传通讯服务器参数。
+ // 传入参数
+ // 1)type:11查询;12增删改,必须
+ // 2)name:存储过程名,必须
+ // 3)data:存储过程参数名和对应值,例如:
+ // this.param[0] = ['设备类型编码', '3', 'string', '0']
+ // this.param[1] = ['output', '3', 'int', '1'],必须
+ // 数组里四个分别对应:存储过程参数名(必须);存储过程参数值(必须);参数类型(若是output必须);参数是否为output(0否1是)
+ // 4)pageSize,pageList:分页使用,可选
+ Vue.prototype.CreateData = function(type, name, data, pageSize, pageList) {
+ var param_Str = ''
+ var param_array = []
+ if (type === '7') {
+ data.map(v => {
+ pageSize.map(h => {
+ const val = h.toString()
+ if (!v[val]) {
+ this.$set(v, val, '')
+ }
+ })
+ })
+ param_Str = data
+ } else {
+ if (data !== undefined) {
+ for (let i = 0; i < data.length; i++) {
+ param_array.push({
+ name: data[i][0],
+ value: data[i][1],
+ type: data[i][2],
+ output: data[i][3]
+ })
+ }
+ param_Str = JSON.stringify(param_array)
+ }
+ }
+ var obj = []
+ obj[0] = {}
+ obj[0].type = type
+ obj[0].name = name
+ obj[0].param = param_Str
+ obj[0].pageSize = pageSize
+ obj[0].pageList = pageList
+ var numn = JSON.stringify(obj[0])
+ return numn
+ }
+ // 高精原CreateData
Vue.prototype.CreateData = function(type, name, data, pageSize, pageList) {
var paramStr = ''
var paramarray = []
@@ -31,6 +77,7 @@ export default {
var numn = JSON.stringify(obj[0])
return numn
}
+
// 用于打开增加框,方法能重置表单,并使表单内容回到初始化状态。
// 传入参数
// 1)表单名称,字符串形式如'form',必须
diff --git a/src/views/ManufacturingCenter/maintainInformation/index.vue b/src/views/ManufacturingCenter/maintainInformation/index.vue
index 423ce63d..99a1f57b 100644
--- a/src/views/ManufacturingCenter/maintainInformation/index.vue
+++ b/src/views/ManufacturingCenter/maintainInformation/index.vue
@@ -16,7 +16,7 @@
导出日点检表
-
+
@@ -49,7 +49,7 @@
点检类型、点检内容维护
-
+
@@ -59,10 +59,9 @@
{{ scope.row.点检表类型名称 }}
-
+
-
- 新增
+ 新增
确定
@@ -104,10 +103,9 @@
{{ scope.row.保养项目 }}
-
+
-
- 新增
+ 新增
确定
From e0057f1f4cd3a252a3a924401e1186a7426a7e75 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Tue, 3 Mar 2020 16:21:08 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=9D=E5=85=BB?=
=?UTF-8?q?=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ManufacturingCenter/maintainInformation/index.vue | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/views/ManufacturingCenter/maintainInformation/index.vue b/src/views/ManufacturingCenter/maintainInformation/index.vue
index 99a1f57b..2bc805a6 100644
--- a/src/views/ManufacturingCenter/maintainInformation/index.vue
+++ b/src/views/ManufacturingCenter/maintainInformation/index.vue
@@ -47,8 +47,9 @@
- 点检类型、点检内容维护
+ 点检类型维护
+ 新增
@@ -60,9 +61,6 @@
-
- 新增
-
确定
取消
@@ -73,6 +71,8 @@
+ 点检内容维护
+ 新增
@@ -104,9 +104,6 @@
-
- 新增
-
确定
取消
From 7abbe219590ddad60a2521807572c260a2fa18ae Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 4 Mar 2020 10:58:28 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=98=E7=92=90=E7=8F=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/MarketingCenter/BidBond/index.vue | 20 ++--
.../ComprehensiveInquiryMS/index.vue | 4 +-
.../ContractCapitalManagement/index.vue | 6 +-
.../ContractInformationManagement/index.vue | 8 +-
.../MarketingCenter/InvoiceRecord/index.vue | 11 +-
.../MarginManagement/index.vue | 2 +-
.../PurchaseTaskAllocate/index.vue | 108 ++++++++++++------
.../CreatingProcurementContracts/index.vue | 6 +-
.../InvoiceSettlementApplication1/index.vue | 22 ++--
.../ProcurementContractEnquiry/index.vue | 2 +-
.../ProjectTotalSearch/index.vue | 6 +-
.../PurchaseContractRequestFund1/index.vue | 35 +++---
12 files changed, 139 insertions(+), 91 deletions(-)
diff --git a/src/views/MarketingCenter/BidBond/index.vue b/src/views/MarketingCenter/BidBond/index.vue
index 918dc368..a22238ad 100644
--- a/src/views/MarketingCenter/BidBond/index.vue
+++ b/src/views/MarketingCenter/BidBond/index.vue
@@ -76,6 +76,11 @@
{{ scope.row.招标企业 }}
+
+
+ {{ scope.row.项目名称 }}
+
+
{{ Number(scope.row.保证金金额).toFixed(2) }}
@@ -141,11 +146,7 @@
-
-
- {{ scope.row.项目名称 }}
-
-
+
{{ scope.row.联系人 }}
@@ -664,10 +665,11 @@ export default {
// val.data[i].投标日期 = val.data[i].投标日期.substring(0, val.data[i].投标日期.length - 8)
// }
if (parseInt(val.data[i].是否收回) !== 2) {
- val.data[i].应收回金额 = '未收回'
+ val.data[i].产品品种代码 = '未收回'
} else {
- val.data[i].应收回金额 = (val.data[i].应收回金额).toFixed(2)
+ val.data[i].产品品种代码 = (val.data[i].应收回金额).toFixed(2)
}
+ val.data[i].应收回金额 = (val.data[i].应收回金额).toFixed(2)
val.data[i].保证金金额 = (val.data[i].保证金金额).toFixed(2)
val.data[i].中标服务费 = (val.data[i].中标服务费).toFixed(2)
val.data[i].未收金额 = (val.data[i].未收金额).toFixed(2)
@@ -675,8 +677,8 @@ export default {
}
if (val.length !== 0) {
import('@/vendor/Export2Excel').then(excel => {
- const tHeader = ['投标结果', '公布日期', '招标企业', '项目名称', '保证金(万元)', '缴纳时间', '投标人', '中标服务费(万元)', '转履约金(万元)', '已收(万元)', '未收(万元)', '保证金备注']
- const filterVal = ['投标结果', '公布日期', '招标企业', '项目名称', '保证金金额', '投标日期', '投标人', '中标服务费', '转履约保证金金额', '应收回金额', '未收金额', '备注']
+ const tHeader = ['投标结果', '公布日期', '招标企业', '项目名称', '保证金金额(万元)', '缴纳时间', '投标人', '中标服务费(万元)', '转履约保证金(万元)', '应收(万元)', '已收(万元)', '未收(万元)', '保证金备注']
+ const filterVal = ['投标结果', '公布日期', '招标企业', '项目名称', '保证金金额', '投标日期', '投标人', '中标服务费', '转履约保证金金额', '应收回金额', '产品品种代码', '未收金额', '备注']
const list = val.data
const data = this.formatJson(filterVal, list)
excel.export_json_to_excel({
diff --git a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
index 22b4d2f0..d401b3bb 100644
--- a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
+++ b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
@@ -14,8 +14,8 @@
-
-
+
+
{{ scope.row.项目名称 }}
diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
index f1caf8f4..6467c70a 100644
--- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue
+++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
@@ -325,14 +325,14 @@ export default {
}
if (val.length !== 0) {
import('@/vendor/Export2Excel').then(excel => {
- const tHeader = ['序号', '合同编号', '项目名称', '客户名称', '付款方式', '合同签订日期', '合同总金额(万元)', '到账金额(万元)', '未收金额(万元)', '营销经理']
- const filterVal = ['序号', '合同编号', '项目名称', '客户名称', '付款方式', '合同签订日期', '合同总金额(万元)', '到账金额(万元)', '未收金额(万元)', '营销经理']
+ const tHeader = ['合同编号', '项目名称', '客户名称', '付款方式', '合同签订日期', '合同金额(万元)', '已收(万元)', '未收(万元)', '营销经理']
+ const filterVal = ['合同编号', '项目名称', '客户名称', '付款方式', '合同签订日期', '合同总金额(万元)', '到账金额(万元)', '未收金额(万元)', '营销经理']
const list = val.data
const data = this.formatJson(filterVal, list)
excel.export_json_to_excel({
header: tHeader,
data,
- filename: getNowShotTime(),
+ filename: '合同收款计划' + getNowShotTime(),
autoWidth: true,
bookType: 'xlsx'
})
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index 9a111b6a..ce14739d 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -331,8 +331,8 @@
-
-
+
+
@@ -344,8 +344,8 @@
diff --git a/src/views/MarketingCenter/InvoiceRecord/index.vue b/src/views/MarketingCenter/InvoiceRecord/index.vue
index b17d786f..3c76b860 100644
--- a/src/views/MarketingCenter/InvoiceRecord/index.vue
+++ b/src/views/MarketingCenter/InvoiceRecord/index.vue
@@ -513,8 +513,8 @@ export default {
}
if (val.length !== 0) {
import('@/vendor/Export2Excel').then(excel => {
- const tHeader = ['序号', '合同编号', '项目名称', '客户名称', '付款方式', '签订日期', '合同金额(万元)', '到账金额(万元)', '开票金额(万元)', '营销经理']
- const filterVal = ['序号', '合同编号', '项目名称', '客户名称', '付款方式', '签订日期', '合同金额', '到账金额', '开票金额', '营销经理']
+ const tHeader = ['合同编号', '项目名称', '客户名称', '付款方式', '合同金额(万元)', '开票金额(万元)', '到账金额(万元)', '签订日期', '营销经理', '合同信息备注']
+ const filterVal = ['合同编号', '项目名称', '客户名称', '付款方式', '合同金额', '开票金额', '到账金额', '签订日期', '营销经理', '合同信息备注']
const list = val.data
const data = this.formatJson(filterVal, list)
excel.export_json_to_excel({
@@ -882,5 +882,12 @@ export default {
>>>.el-form-item {
margin-bottom: 13px;
}
+ .el-table td.gutter,.el-table th.gutter{
+ width: 15px;
+ border-right-width: 0;
+ border-bottom-width: 0;
+ padding: 30px;
+ background: white;
+ }
diff --git a/src/views/MarketingCenter/MarginManagement/index.vue b/src/views/MarketingCenter/MarginManagement/index.vue
index 9a508e72..408ce091 100644
--- a/src/views/MarketingCenter/MarginManagement/index.vue
+++ b/src/views/MarketingCenter/MarginManagement/index.vue
@@ -24,7 +24,7 @@ export default {
},
data() {
return {
- handle: '',
+ handle: '投标保证金',
tabName: '投标保证金'
}
},
diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
index 073c8911..cbae4c9f 100644
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -130,7 +130,7 @@
highlight-current-row
@selection-change="handleSelectionChange1">
-
+
未分配
未询价
@@ -299,23 +299,40 @@
:label="item.label"
:value="item.value"/>
- 查询
- 未分配
- 已分配
-
+ 查询
+ 已分配
+
+
+
- 分配
- 打回
+
+ 分配
+
+
+ 打回
+
+
+
-
-
+
+
未分配
未询价
@@ -343,7 +360,7 @@
{{ scope.row.零件数量 }}
-
+
{{ scope.row.机床图号 }}
@@ -353,12 +370,12 @@
{{ scope.row.组号 }}
-
+
{{ scope.row.物料类别 }}
-
+
{{ scope.row.物料品种 }}
@@ -368,7 +385,7 @@
{{ scope.row.备注 }}
-
+
{{ scope.row.供货商 }}
@@ -451,36 +468,53 @@
- 查询
- 未分配
- 已分配
-
+ 查询
+ 已分配
+
+
+
- 分配
- 打回
+
+ 分配
+
+
+ 打回
+
+
+
-
-
-
+
+
+
- 未分配
- 未询价
- 已询价
- 已采购
+ 未分配
+ 未询价
+ 已询价
+ 已采购
-
+
{{ scope.row.零件图号 }}
-
+
{{ scope.row.零件名称 }}
@@ -500,11 +534,11 @@
{{ scope.row.零件数量 }}
-
-
- {{ scope.row.项目名称 }}
-
-
+
+
+
+
+
{{ scope.row.机床图号 }}
@@ -520,7 +554,7 @@
{{ scope.row.备注 }}
-
+
{{ scope.row.供货商 }}
@@ -701,7 +735,9 @@ export default {
pageCurrent2: 1,
pageSize2: 50,
total2: 0,
- checked: false
+ checked: false,
+ checked2: false,
+ checked3: false
}
},
computed: {
@@ -895,6 +931,7 @@ export default {
this.materialName ? this.check4 = 1 : this.check4 = 0
this.materialSpec ? check2 = 1 : check2 = 0
this.materialModel ? check3 = 1 : check3 = 0
+ this.checked2 ? this.radio = 2 : this.radio = 1
searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, parseInt(this.radio), check2, this.materialSpec, check3, this.materialModel, 2).then(response => {
this.tableData1 = response.data.rows
this.total1 = response.data.total
@@ -911,6 +948,7 @@ export default {
this.partMaterial ? check4 = 1 : check4 = 0
this.machineValue ? check5 = 1 : check5 = 0
this.groupValue ? check6 = 1 : check6 = 0
+ this.checked3 ? this.radio = 2 : this.radio = 1
searchTable2(this.pageCurrent2, this.pageSize2, this.check3, this.projectValue, check5, this.machineValue, check6, this.groupValue, parseInt(this.radio), check1, this.partNum, check2, this.partName, check3, this.partSpec, check4, this.partMaterial).then(response => {
this.tableData2 = response.data.rows
this.total2 = response.data.total
diff --git a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
index f6ee51cc..da077a05 100644
--- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
+++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
@@ -22,7 +22,7 @@
:value="item.value"/>
-
+
-
+
成组采购
- 取消成组采购
+ 取消成组采购
diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
index da1bcb49..77dfdbee 100644
--- a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
+++ b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
@@ -1,14 +1,14 @@
- 发票号:
-
+
+
查询
- 创建
+ 到票
- 发票结算申请单
+ 到票结算申请单
@@ -127,7 +127,7 @@
- 发票结算申请单明细
+ 到票结算申请单明
发票号:
追加入库记录
@@ -184,8 +184,8 @@
-
-
+
+
@@ -193,8 +193,8 @@
-
-
+
+
@@ -211,14 +211,14 @@
-
+
-
+
diff --git a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
index 74030d17..8262f163 100644
--- a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
+++ b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
@@ -113,7 +113,7 @@
打印
- 打回
+ 打回
diff --git a/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue b/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
index 11872e98..2ed5b6d0 100644
--- a/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
+++ b/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
@@ -24,7 +24,7 @@
style="margin-left:10px"
@click="exportExcel()">导出项目采购明细
-
+
@@ -48,12 +48,12 @@
- {{ scope.row.单价 }}
+ {{ scope.row.单价.toFixed(2) }}
- {{ scope.row.金额 }}
+ {{ scope.row.金额.toFixed(2) }}
diff --git a/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue b/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
index d25cbdfc..bf968e1b 100644
--- a/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
+++ b/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
@@ -1,7 +1,7 @@
- 时间段:
+
- 供应商:
-
+
+
查询
- 新增请款
+ 请款
-
+
-
+
{{ scope.row.供应商名称 }}
@@ -56,19 +56,19 @@
-
+
未审批
已通过
不通过
-
+
{{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
-
+
未操作
已同意
@@ -81,7 +81,7 @@
-
+
@@ -110,23 +110,23 @@
-
+
-
+
{{ scope.row.采购合同编号 }}
-
+
- {{ scope.row.已付金额 }}
+ {{ scope.row.已付金额.toFixed(2) }}
-
+
- {{ scope.row.请款金额 }}
+ {{ scope.row.请款金额.toFixed(2) }}
@@ -394,6 +394,7 @@ export default {
searchTable02(row) { // 查看详情(请款信息包含的合同)
searchRequsetFundDetail(row.采购合同请款流水号).then(response => {
this.gridData = response.data
+ console.log(response, 123123)
})
},
cancelRequestFund(row) { // 取消请款