diff --git a/src/api/PurchasingCenter/InvoiceSettlementApplication.js b/src/api/PurchasingCenter/InvoiceSettlementApplication.js
index 384fac06..5bf76f62 100644
--- a/src/api/PurchasingCenter/InvoiceSettlementApplication.js
+++ b/src/api/PurchasingCenter/InvoiceSettlementApplication.js
@@ -65,7 +65,7 @@ export function submitDelete(...group) {
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
- type: '1',
+ type: '2',
name: '采购管理_发票结算申请单_删除数据',
param: `发票结算申请单流水号=${group[0]}`
}
diff --git a/src/api/PurchasingCenter/InvoiceSettlementApprove.js b/src/api/PurchasingCenter/InvoiceSettlementApprove.js
index 516102a5..e725386c 100644
--- a/src/api/PurchasingCenter/InvoiceSettlementApprove.js
+++ b/src/api/PurchasingCenter/InvoiceSettlementApprove.js
@@ -39,9 +39,9 @@ export function excuteApprove(...data) {
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
- type: '1',
+ type: '2',
name: '采购管理_发票结算申请单_执行审批',
- param: `发票结算申请单流水号=${data[0]}&人员编号=${data[1]}&审批代号=${data[2]}`
+ param: `发票结算申请单流水号=${data[0]}&人员编号=${data[1]}&审批代号=${data[2]}&审批流水号=${data[3]}&未通过原因=${data[4]}`
}
})
}
diff --git a/src/views/BasicData/PartsNumberMaintenance/index.vue b/src/views/BasicData/PartsNumberMaintenance/index.vue
index 8a209a5d..168011df 100644
--- a/src/views/BasicData/PartsNumberMaintenance/index.vue
+++ b/src/views/BasicData/PartsNumberMaintenance/index.vue
@@ -82,10 +82,10 @@
-
+
-
+
@@ -175,16 +175,14 @@
编辑
+ @click="type=1;handleEdit(scope.row)"/>
删除
+ @click="handleDelete(scope.row)"/>
@@ -246,9 +244,8 @@
编辑
+ type="text"
+ @click="type=1;handleEdit(scope.row)"/>
@@ -306,9 +303,8 @@
编辑
+ type="text"
+ @click="handleEdit(scope.row)"/>
@@ -378,9 +374,8 @@
编辑
+ type="text"
+ @click="type=2;handleEdit(scope.row)"/>
@@ -442,8 +437,8 @@
编辑
+ type="text"
+ @click="type=2;handleEdit(scope.row)"/>
@@ -807,6 +802,7 @@ export default {
const part_check = this.partNumber ? 1 : 0
this.loading = true
basicPartsData(machine_check, this.machineValue, group_check, this.groupValue, part_check, this.partNumber).then(response => {
+ console.log(response, 111)
this.loading = false
const res = response.data
this.total = res.total
diff --git a/src/views/ManufacturingCenter/ManHourStatistics/index.vue b/src/views/ManufacturingCenter/ManHourStatistics/index.vue
index e058b55a..ab1a3c0f 100644
--- a/src/views/ManufacturingCenter/ManHourStatistics/index.vue
+++ b/src/views/ManufacturingCenter/ManHourStatistics/index.vue
@@ -14,7 +14,7 @@
end-placeholder="结束日期"/>
查询
- 导出
+ 导出
@@ -186,13 +186,13 @@ export default {
var param = []
param[0] = ['操作者_check', check]
param[1] = ['姓名', this.workerName]
- param[6] = ['时间_check', check1]
+ param[2] = ['时间_check', check1]
if (check1 === 0) {
- param[7] = ['开始时间', '']
- param[8] = ['结束时间', '']
+ param[3] = ['开始时间', '']
+ param[4] = ['结束时间', '']
} else {
- param[7] = ['开始时间', this.dateRange[0]]
- param[8] = ['结束时间', this.dateRange[1]]
+ param[3] = ['开始时间', this.dateRange[0]]
+ param[4] = ['结束时间', this.dateRange[1]]
}
var Data = this.CreateData('2001', '报表_人员工时查询', param)
this.exportExcel_NPOI(Data)
diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
index ee9305eb..762b1615 100644
--- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
+++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
@@ -297,6 +297,13 @@ export default {
this.finishTime ? check5 = 1 : (check5 = 0, this.finishTime = '')
search(this.pageCurrent, this.pageSize, check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.PrNum, check4, this.personValue, check5, this.finishTime[0], this.finishTime[1]).then(response => {
this.tableData = response.data.rows
+ this.tableData.map(v => {
+ this.$set(v)
+ if (v.工艺员 === '超级管理员') {
+ v.工艺员 = ''
+ }
+ return v
+ })
this.total = response.data.total
this.loading = false
})
diff --git a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
index cda876e6..1dcd3ba5 100644
--- a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
+++ b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
@@ -87,9 +87,14 @@
{{ scope.row.申请时间 ? scope.row.申请时间.split(' ')[0] : '—' }}
-
+
- {{ scope.row.审批人1姓名 ? scope.row.审批人1姓名 : '未审核' }}
+ {{ scope.row.审批1结果 }}
+
+
+
+
+ {{ scope.row.审批1未过原因 ? scope.row.审批1未过原因 : '—' }}
@@ -97,9 +102,14 @@
{{ scope.row.审批1时间 ? scope.row.审批1时间.split(' ')[0] : '—' }}
-
+
- {{ scope.row.审批人4姓名 ? scope.row.审批人4姓名 : '未审批' }}
+ {{ scope.row.审批4结果 }}
+
+
+
+
+ {{ scope.row.审批4未过原因 ? scope.row.审批4未过原因 : '—' }}
@@ -109,7 +119,12 @@
- {{ scope.row.审批人3姓名 ? scope.row.审批人3姓名 : '未审批' }}
+ {{ scope.row.审批3结果 }}
+
+
+
+
+ {{ scope.row.审批3未过原因 ? scope.row.审批3未过原因 : '—' }}
@@ -121,7 +136,7 @@
提交申请
-
+
@@ -459,7 +474,7 @@ export default {
limit: 1,
tableData01: [],
tableData02: [],
- tableDara03: [],
+ tableData03: [],
inboundCardNumber: '', // 入库单号
group: [] // 发票结算申请单明细流水号组
}
diff --git a/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
index 9843c02e..5883be48 100644
--- a/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
+++ b/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
@@ -103,9 +103,13 @@
{{ scope.row.审批3时间 ? scope.row.审批3时间.split(' ')[0] : '—' }}
-
+
+
+
+
- 审批
+ 通过
+ 不通过
@@ -268,27 +272,66 @@ export default {
this.pageCurrent1 = val
this.searchTable1()
},
- excuteApprove(row) {
- this.$confirm('确认审批签字?', '提示', {
+ yesApproval(row) { // 通过审核
+ this.$confirm('确定审核通过?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
- excuteApprove(row.发票结算申请单流水号, this.id, this.token).then(response => {
- if (response.data[0].result === '审批成功') {
- this.$message.success('审批成功')
+ excuteApprove(row.发票结算申请单流水号, this.id, this.token, 1, '').then(response => {
+ console.log(response, 11)
+ if (response.data[0].result === '1') {
+ this.$message.success('执行成功')
this.searchTable1()
- } else if (response.data[0].result === '已完成审批') {
- this.$message.warning('已完成审批，不可重复审批')
- } else { this.$message.error('审批失败') }
+ } else { this.$message.error('执行失败') }
})
}).catch(() => {
this.$message({
type: 'info',
- message: '已取消审批'
+ message: '取消操作'
})
})
},
+ noApproval(row) { // 不通过审核
+ this.$prompt('请输入不通过原因', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消'
+ }).then(({ value }) => {
+ excuteApprove(row.发票结算申请单流水号, this.id, this.token, 2, value).then(response => {
+ if (response.data[0].result === '1') {
+ this.$message.success('执行成功')
+ this.tableData2 = []
+ this.searchTable1()
+ } else { this.$message.error('执行失败') }
+ })
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '取消操作'
+ })
+ })
+ },
+ // excuteApprove(row) {
+ // this.$confirm('确认审批签字?', '提示', {
+ // confirmButtonText: '确定',
+ // cancelButtonText: '取消',
+ // type: 'warning'
+ // }).then(() => {
+ // excuteApprove(row.发票结算申请单流水号, this.id, this.token).then(response => {
+ // if (response.data[0].result === '审批成功') {
+ // this.$message.success('审批成功')
+ // this.searchTable1()
+ // } else if (response.data[0].result === '已完成审批') {
+ // this.$message.warning('已完成审批，不可重复审批')
+ // } else { this.$message.error('审批失败') }
+ // })
+ // }).catch(() => {
+ // this.$message({
+ // type: 'info',
+ // message: '已取消审批'
+ // })
+ // })
+ // },
searchTable2(row) {
this.invoiceNumber = row.发票号
searchTable2(row.发票结算申请单流水号).then(response => {