diff --git a/src/assets/img/img20.png b/src/assets/img/img20.png new file mode 100644 index 00000000..2ed59f26 Binary files /dev/null and b/src/assets/img/img20.png differ diff --git a/src/assets/img/img21.png b/src/assets/img/img21.png new file mode 100644 index 00000000..2019a41f Binary files /dev/null and b/src/assets/img/img21.png differ diff --git a/src/assets/img/img22.png b/src/assets/img/img22.png new file mode 100644 index 00000000..9458f6e3 Binary files /dev/null and b/src/assets/img/img22.png differ diff --git a/src/assets/img/shebeijiankong.png b/src/assets/img/shebeijiankong.png new file mode 100644 index 00000000..d9de62db Binary files /dev/null and b/src/assets/img/shebeijiankong.png differ diff --git a/src/utils/request.js b/src/utils/request.js index f61bf8ab..b6dbd859 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -23,7 +23,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` const service = axios.create({ - baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.0.101:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue new file mode 100644 index 00000000..d0139c12 --- /dev/null +++ b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue @@ -0,0 +1,387 @@ + + + + + diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue index 2a4dc026..0aa4a8b8 100644 --- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue +++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue @@ -800,23 +800,29 @@ export default { } }) if (this.contractNumValue) { - this.$confirm('此采购合同将递交审批，递交后该合同不可删除，确认完成编辑？', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - doneContract(this.contractNum, this.contractName, this.deliveryDate, this.payDate, this.payMethod, this.invoiceInfo, this.otherInfo, this.actualTotal, this.id, this.supplierValue, this.单价是否含税, this.组件零件流水号组, this.组件零件基本件流水号组, this.数量组, this.单价组, this.交货期组, this.content, this.taxRate * 100, inquiryDetailNum_old, this.备注组).then(response => { - if (response.data[0].result === '1') { - this.$message.success('合同生成成功') - this.reload() - } else { this.$message.error('生成合同失败') } + if (this.demoRadio) { + this.$confirm('此采购合同将递交审批，递交后该合同不可删除，确认完成编辑？', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + doneContract(this.contractNum, this.contractName, this.deliveryDate, this.payDate, this.payMethod, this.invoiceInfo, this.otherInfo, this.actualTotal, this.id, this.supplierValue, this.单价是否含税, this.组件零件流水号组, this.组件零件基本件流水号组, this.数量组, this.单价组, this.交货期组, this.content, this.taxRate * 100, inquiryDetailNum_old, this.备注组).then(response => { + if (response.data[0].result === '1') { + this.$message.success('合同生成成功') + this.reload() + } else { + this.$message.error('生成合同失败') + } + }) + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消操作' + }) }) - }).catch(() => { - this.$message({ - type: 'info', - message: '已取消操作' - }) - }) + } else { + this.$message.warning('请先选择模板进行预览') + } } else { this.$message.warning('请先选择合同进行编辑') }