- 时间段:
-
+
+
+
+
+
+
+
+
+
+
合同号:
-
-
- {{ scope.row.采购合同编号 }}
-
-
-
-
- {{ scope.row.采购合同名称 }}
-
-
-
-
- {{ scope.row.规定到货时间 }}
-
-
-
-
- {{ scope.row.供应商名称 }}
-
-
-
-
- {{ scope.row.姓名 }}
-
-
-
-
- {{ scope.row.总金额 }}
-
-
-
-
- {{ scope.row.付款方式内容 }}
-
-
未审批
@@ -106,6 +70,56 @@
不通过审批
+
+
+ {{ scope.row.采购合同编号 }}
+
+
+
+
+ {{ scope.row.采购合同名称 }}
+
+
+
+
+ {{ scope.row.供应商名称 }}
+
+
+
+
+ {{ scope.row.姓名 }}
+
+
+
+
+ {{ scope.row.合同总额 }}
+
+
+
+
+ {{ scope.row.交货日期 }}
+
+
+
+
+ {{ scope.row.支付日期 }}
+
+
+
+
+ {{ scope.row.支付方式 }}
+
+
+
+
+ {{ scope.row.开票信息 }}
+
+
+
+
+ {{ scope.row.其他说明 }}
+
+
{{ scope.row.未通过原因 }}
@@ -124,61 +138,11 @@
@current-change="handleCurrentChange1"/>
-
二维码：
![]()
-
-
-
-
-
- | GAOJING |
- 产品销售合同 |
- |
-
-
- | 需方 |
- 江苏高精机电装备有限公司 |
- 合同编号 |
- {{ contract }} |
-
-
- | 供方 |
- {{ supplier }} |
- 签订地点 |
- 江苏盐城 |
-
-
-
一、 产品名称、型号、数量、单价、品牌：
-
-
-
- | 物料名称 |
- 物料规格 |
- 物料型号 |
- 数量 |
- 单价 |
- 总价 |
-
-
-
-
- | 运费： |
- {{ freight }} |
-
-
- | 总价: (人民币){{ RMB }}(含0.17增值税) |
- {{ TotalAmount }} |
-
-
-
-
-
-
附件图：
@@ -233,7 +197,7 @@ export default {
pageSize1: 10,
tableData1: [],
loading1: false,
- returns: [],
+ returns: '',
tableData01: [],
tableData02: [],
submitDisable: true,
@@ -318,25 +282,10 @@ export default {
}
searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.startEndDate[0], this.startEndDate[1], this.check2, this.contractNumValue, this.check3, this.personValue, this.check4, this.supplierName, this.check5, this.approvalValue).then(response => {
this.loading1 = false
- for (let j = 0; j < response.data.rows.length; j++) {
- if (response.data.rows[j].操作日期 !== null) {
- response.data.rows[j].操作日期 = response.data.rows[j].操作日期.substring(0, response.data.rows[j].操作日期.indexOf(' '))
- }
- if (response.data.rows[j].规定到货时间 !== null) {
- response.data.rows[j].规定到货时间 = response.data.rows[j].规定到货时间.substring(0, response.data.rows[j].规定到货时间.indexOf(' '))
- }
- }
this.tableData1 = response.data.rows
this.total1 = response.data.total
})
},
- tableRowClassName({ row, rowIndex }) {
- // if (row.审批情况流水号 === '1') {
- // return 'adopt'
- // } else if (row.审批情况流水号 === '2') {
- // return 'NotThrough'
- // }
- },
handleSizeChange1(val) {
this.pageCurrent1 = 1
this.pageSize1 = val
@@ -348,40 +297,10 @@ export default {
},
searchTable2(row) {
this.useqrcode(row.采购合同流水号)
- this.textarea = row.合同文本
- this.supplier = row.供应商名称
- this.contract = row.采购合同编号
this.searchPic() // 显示图片
- this.freight = parseInt(row.总金额) - parseInt(row.总金额_小计)
- this.RMB = row.总金额_文本
- this.TotalAmount = row.总金额
- document.getElementById('23').innerText = this.textarea
this.contractValue = parseInt(row.采购合同流水号)
searchTable2(this.contractValue).then(response => {
- this.returns = response.data
- const children = document.getElementsByClassName('tableData')
- const parent = document.getElementById('4')
- if (children.length !== 0) {
- for (let i = children.length - 1; i >= 0; i--) {
- parent.removeChild(children[i])
- }
- }
- const tr = []
- for (let i = 0; i < this.returns.length; i++) {
- tr[i] = document.createElement('tr')
- tr[i].setAttribute('class', 'tableData')
- tr[i].innerHTML = ' | ' + ' | ' + ' | ' +
- ' | ' + ' | ' + ' | '
- document.getElementById('tableHead').after(tr[i])
- }
- for (let j = 0; j < this.returns.length; j++) {
- document.getElementsByClassName('tableData')[j].children[0].innerHTML = response.data[j].物料名称
- document.getElementsByClassName('tableData')[j].children[1].innerHTML = response.data[j].物料规格
- document.getElementsByClassName('tableData')[j].children[2].innerHTML = response.data[j].物料型号
- document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].数量
- document.getElementsByClassName('tableData')[j].children[4].innerHTML = response.data[j].单价
- document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].金额
- }
+ this.returns = response.data[0].合同内容
})
}
}
diff --git a/src/views/TechnologyCenter/ImportChangeParts/index.vue b/src/views/TechnologyCenter/ImportChangeParts/index.vue
index bb1e7089..27d5a90f 100644
--- a/src/views/TechnologyCenter/ImportChangeParts/index.vue
+++ b/src/views/TechnologyCenter/ImportChangeParts/index.vue
@@ -161,7 +161,6 @@ export default {
classificationCode
console.log(this.worksheet[j].M2.v.substring(0, 1))
if (this.worksheet[j].M2.v.substring(0, 1) === '9') {
- console.log('哈哈哈哈哈')
const response = await isExit(this.projectValue, this.worksheet[j].F2.v)
const res = response.data
if (res[0].Column1 === 0) {
@@ -198,9 +197,6 @@ export default {
} else {
if (machineNum && groupNum) {
await sleep(50)
- if (classificationCode) {
- drawingNum += '-' + classificationCode
- }
await this.insertToSQL(establishment, proofread, review, date, machineName, machineNum, componentName, componentNum, groupNum, contractNum, pageNum, totalNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode)
} else {
this.loading = false
@@ -232,9 +228,13 @@ export default {
if (groupNum.indexOf('MX') > -1) {
const response = await importBasics(establishment, proofread, review, date, this.projectName, machineNum, machineName, componentName, componentNum, groupNum, contractNum, totalNum, pageNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode)
const res = response.data
+ console.log(res)
if (res[0].result === '0') {
this.$notify.error(`${drawingNum}导入失败`)
}
+ if (res[0].result === '2') {
+ this.$notify.error(`${drawingNum}导入重复`)
+ }
} else {
const response = await importPurcharse(establishment, proofread, review, date, this.projectName, machineNum, machineName, componentName, componentNum, groupNum, contractNum, totalNum, pageNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode)
const res = response.data
diff --git a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
index 40ed0bf3..2d78a2d6 100644
--- a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
+++ b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
@@ -544,7 +544,8 @@ export default {
for (let i = 0; i < this.tableDataAll.length; i++) {
const data = this.tableDataAll[i]
const total = parseInt(data.备件数量) + parseInt(data.装机数量) * parseInt(data.部件数量)
- const resp = await transferMX1(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, 1, data.是否传递, data.序号, data.id, data.前id)
+ console.log(data.前id, data.前图号或者型号)
+ const resp = await transferMX1(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, 1, data.是否传递, data.序号, data.id, data.前id, data.前图号或者型号)
await sleep(10)
if (resp.data[0].result === '0') {
this.err++
diff --git a/src/views/TechnologyCenter/ImportParts/index.vue b/src/views/TechnologyCenter/ImportParts/index.vue
index b037f57d..bcac8fcd 100644
--- a/src/views/TechnologyCenter/ImportParts/index.vue
+++ b/src/views/TechnologyCenter/ImportParts/index.vue
@@ -167,54 +167,57 @@ export default {
this.disabled = false
return
} else {
- console.log(this.worksheet[j], 2222)
- this.worksheet[j].G1 ? establishment = this.worksheet[j].G1.v : establishment = ''
- this.worksheet[j].I1 ? proofread = this.worksheet[j].I1.v : proofread = ''
- this.worksheet[j].L1 ? review = this.worksheet[j].L1.v : review = ''
- this.worksheet[j].P1 ? date = this.worksheet[j].P1.v : date = ''
- this.worksheet[j].Q1 ? pageNum = parseInt(this.worksheet[j].Q1.v.replace(/[^0-9]/ig, '')) : pageNum = ''
- this.worksheet[j].C2 ? machineName = this.worksheet[j].C2.v : machineName = ''
- this.worksheet[j].F2 ? machineNum = this.worksheet[j].F2.v : machineNum = ''
- this.worksheet[j].J2 ? componentName = this.worksheet[j].J2.v : componentName = ''
- this.worksheet[j].P2 ? componentNum = this.worksheet[j].P2.v : componentNum = ''
- this.worksheet[j].Q2 ? totalNum = parseInt(this.worksheet[j].Q2.v.replace(/[^0-9]/ig, '')) : totalNum = ''
- this.worksheet[j].R2 ? contractNum = this.worksheet[j].R2.v : contractNum = ''
- this.worksheet[j].M2 ? groupNum = this.worksheet[j].M2.v : groupNum = ''
- for (let i = 0; i < 999; i++) {
- const attr = i + 4
- drawingNum = this.worksheet[j][`B${attr}`] ? this.worksheet[j][`B${attr}`].v : ''
- name = this.worksheet[j][`D${attr}`] ? this.worksheet[j][`D${attr}`].v : ''
- type = this.worksheet[j][`F${attr}`] ? this.worksheet[j][`F${attr}`].v : ''
- material = this.worksheet[j][`J${attr}`] ? this.worksheet[j][`J${attr}`].v : ''
- spareNum = this.worksheet[j][`L${attr}`] ? this.worksheet[j][`L${attr}`].v : ''
- useNum = this.worksheet[j][`M${attr}`] ? this.worksheet[j][`M${attr}`].v : ''
- manufacturer = this.worksheet[j][`O${attr}`] ? this.worksheet[j][`O${attr}`].v : ''
- remarks = this.worksheet[j][`Q${attr}`] ? this.worksheet[j][`Q${attr}`].v : ''
- classificationCode = this.worksheet[j][`R${attr}`] ? this.worksheet[j][`R${attr}`].v : ''
- console.log(drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode, 2222222222)
- if (!drawingNum && !name && !type && !material && !spareNum && !useNum && !manufacturer && !remarks && !classificationCode) { // 当图号、名称、规格、材料、备件数量、装机数量、制造商、备注、分类码都为空时，循环终止，防止向数据库中插入多余且无用的数据
- break
- } else {
- if (machineNum && groupNum) {
- await sleep(50)
- if (classificationCode) {
- drawingNum += '-' + classificationCode
- }
- await this.insertToSQL(establishment, proofread, review, date, machineName, machineNum, componentName, componentNum, groupNum, contractNum, pageNum, totalNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode)
+ if (this.worksheet[j].M2.v.substring(0, 1) !== '9') {
+ this.worksheet[j].G1 ? establishment = this.worksheet[j].G1.v : establishment = ''
+ this.worksheet[j].I1 ? proofread = this.worksheet[j].I1.v : proofread = ''
+ this.worksheet[j].L1 ? review = this.worksheet[j].L1.v : review = ''
+ this.worksheet[j].P1 ? date = this.worksheet[j].P1.v : date = ''
+ this.worksheet[j].Q1 ? pageNum = parseInt(this.worksheet[j].Q1.v.replace(/[^0-9]/ig, '')) : pageNum = ''
+ this.worksheet[j].C2 ? machineName = this.worksheet[j].C2.v : machineName = ''
+ this.worksheet[j].F2 ? machineNum = this.worksheet[j].F2.v : machineNum = ''
+ this.worksheet[j].J2 ? componentName = this.worksheet[j].J2.v : componentName = ''
+ this.worksheet[j].P2 ? componentNum = this.worksheet[j].P2.v : componentNum = ''
+ this.worksheet[j].Q2 ? totalNum = parseInt(this.worksheet[j].Q2.v.replace(/[^0-9]/ig, '')) : totalNum = ''
+ this.worksheet[j].R2 ? contractNum = this.worksheet[j].R2.v : contractNum = ''
+ this.worksheet[j].M2 ? groupNum = this.worksheet[j].M2.v : groupNum = ''
+ for (let i = 0; i < 999; i++) {
+ const attr = i + 4
+ drawingNum = this.worksheet[j][`B${attr}`] ? this.worksheet[j][`B${attr}`].v : ''
+ name = this.worksheet[j][`D${attr}`] ? this.worksheet[j][`D${attr}`].v : ''
+ type = this.worksheet[j][`F${attr}`] ? this.worksheet[j][`F${attr}`].v : ''
+ material = this.worksheet[j][`J${attr}`] ? this.worksheet[j][`J${attr}`].v : ''
+ spareNum = this.worksheet[j][`L${attr}`] ? this.worksheet[j][`L${attr}`].v : ''
+ useNum = this.worksheet[j][`M${attr}`] ? this.worksheet[j][`M${attr}`].v : ''
+ manufacturer = this.worksheet[j][`O${attr}`] ? this.worksheet[j][`O${attr}`].v : ''
+ remarks = this.worksheet[j][`Q${attr}`] ? this.worksheet[j][`Q${attr}`].v : ''
+ classificationCode = this.worksheet[j][`R${attr}`] ? this.worksheet[j][`R${attr}`].v : ''
+ if (!drawingNum && !name && !type && !material && !spareNum && !useNum && !manufacturer && !remarks && !classificationCode) { // 当图号、名称、规格、材料、备件数量、装机数量、制造商、备注、分类码都为空时，循环终止，防止向数据库中插入多余且无用的数据
+ break
} else {
- this.loading = false
- this.disabled = false
- this.$notify.error(`请确认导入文件是否正确`)
- return
+ if (machineNum && groupNum) {
+ await sleep(50)
+ if (classificationCode) {
+ drawingNum += '-' + classificationCode
+ }
+ await this.insertToSQL(establishment, proofread, review, date, machineName, machineNum, componentName, componentNum, groupNum, contractNum, pageNum, totalNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode)
+ } else {
+ this.loading = false
+ this.disabled = false
+ this.$notify.error(`请确认导入文件是否正确`)
+ return
+ }
}
}
+ } else {
+ this.$notify.error('禁止导入整改组')
+ break
}
}
this.itemFile.splice(j, 1)
this.worksheet.splice(j, 1)
+ this.err === 0 ? this.$message.success(`导入完成`) : this.$message.error(`导入失败零件个数为${this.err}，请检查文件是否正确`)
}
this.loading = false
- this.err === 0 ? this.$message.success(`导入完成`) : this.$message.error(`导入失败零件个数为${this.err}，请检查文件是否正确`)
this.projectChange(this.projectName) // 调用查询机床方法，通过watch属性检测变化会自动得到下面表格的值。
} catch (e) {
console.log(e)
diff --git a/src/views/TechnologyCenter/ImportParts/specificationData.vue b/src/views/TechnologyCenter/ImportParts/specificationData.vue
index be6c409e..16d5b4ad 100644
--- a/src/views/TechnologyCenter/ImportParts/specificationData.vue
+++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue
@@ -487,8 +487,9 @@ export default {
if (this.groupValue.indexOf('MX') > -1) {
for (let i = 0; i < this.tableDataAll.length; i++) {
const data = this.tableDataAll[i]
+ console.log(data)
const total = parseInt(data.备件数量) + parseInt(data.装机数量) * parseInt(data.部件数量)
- const resp = await transferMX(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, 1, data.是否传递, data.序号, data.id)
+ const resp = await transferMX(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.id)
await sleep(10)
if (resp.data[0].result === '0') {
this.err++
diff --git a/src/views/TechnologyCenter/QueryParts/index.vue b/src/views/TechnologyCenter/QueryParts/index.vue
index 4ea18908..4c2bc6f9 100644
--- a/src/views/TechnologyCenter/QueryParts/index.vue
+++ b/src/views/TechnologyCenter/QueryParts/index.vue
@@ -28,7 +28,7 @@
:value="item.value"/>
- 查询
+ 查询
删除