diff --git a/src/utils/request.js b/src/utils/request.js
index fc41e22d..2cb92ad8 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -26,7 +26,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.110:8002/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})
export default service
diff --git a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
index 13a8076a..76e64941 100644
--- a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
+++ b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
@@ -23,15 +23,14 @@
-
-
+
{{ scope.row.工艺名称 }}
-
+
- {{ scope.row.员工姓名 }}
+ {{ scope.row.员工姓名 === '超级管理员' && scope.row.工序状态 !== 4 ? '' : scope.row.员工姓名 }}
@@ -39,24 +38,31 @@
{{ scope.row.投产数量 }}
+
+
+ {{ scope.row.工序状态 === 4 ? '已完成' : '未完成' }}
+
+
-
+
机床图号：{{ 机床图号 }} 机床名称：{{ 机床名称 }}
-
+
-
+
@@ -157,8 +163,11 @@ export default {
firstLevel.children = []
for (let j = 0; j < response.data.length; j++) {
firstLevel.children.push({
- label: (response.data[j].零件图号 ? response.data[j].零件图号 : '无零件图号') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].规格 ? response.data[j].规格 : '') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].投产总数量 ? response.data[j].投产总数量 : '') + '..........' + (response.data[j].零件名称 ? response.data[j].零件名称 : '无零件名称'),
+ label: (response.data[j].零件图号 ? response.data[j].零件图号 : '无零件图号') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].规格 ? response.data[j].规格 : '') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].投产总数量 ? response.data[j].投产总数量 : '') + '..........' + (response.data[j].零件名称 ? response.data[j].零件名称 : '无零件名称') + (response.data[j].零件类型 === 1 ? '' : '\xa0\xa0\xa0\xa0\xa0\xa0外购'),
value: response.data[j].工艺计划流水号,
+ 考核状态: response.data[j].考核状态,
+ 采购状态: response.data[j].采购状态,
+ 零件类型: response.data[j].零件类型,
father: false
})
}
@@ -171,14 +180,40 @@ export default {
onClick(num) {
this.tableData1 = []
this.tableData2 = []
- if (num.father === true) {
- selectParts(1, num.value, 0, 0).then(response => {
- this.tableData2 = response.data
- })
+ if (num.father === false) {
+ if (num.零件类型 === 1) {
+ selectProcedure(num.value).then(response => {
+ this.tableData1 = response.data
+ })
+ }
+ }
+ // if (num.father === true) {
+ // selectParts(1, num.value, 0, 0).then(response => {
+ // this.tableData2 = response.data
+ // })
+ // } else {
+ // selectParts(0, 0, 1, num.value).then(response => {
+ // this.tableData2 = response.data
+ // })
+ // }
+ },
+ renderContent(h, { node, data, store }) {
+ if (node.data.father === false) {
+ if (node.data.零件类型 === 1) { // 自制
+ if (parseInt(node.data.考核状态) > 6) {
+ return ({node.label})
+ } else {
+ return ({node.label})
+ }
+ } else { // 外购
+ if (node.data.采购状态 === '已完成') {
+ return ({node.label})
+ } else {
+ return ({node.label})
+ }
+ }
} else {
- selectParts(0, 0, 1, num.value).then(response => {
- this.tableData2 = response.data
- })
+ return ({node.label})
}
},
searchTable1(row) {
@@ -196,5 +231,15 @@ export default {
.el-tree-node__content>.el-tree-node__expand-icon{
display: inline !important;
}
+ .el-tree-node:focus > .el-tree-node__content {
+ background-color: #ccc !important;
+ }
+ }
+ .treeNotesComplate {
+ color: black;
+ background-color: #67C23A;
+ }
+ .treeNotesUnComplate {
+ color: black;
}
diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
index 5c887249..fc0f21bf 100644
--- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue
+++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
@@ -9,8 +9,6 @@
:label="item.label"
:value="item.value"/>
-
-
客户名称：
查询
-
查看收款信息
-
-
-
-
-
-
-
-
- {{ scope.row.合同编号 }}
-
-
-
-
- {{ scope.row.项目名称 }}
-
-
-
-
- {{ scope.row.客户名称 }}
-
-
-
-
- {{ scope.row.付款方式 }}
-
-
-
-
- {{ Number(scope.row.合同总金额).toFixed(2) }}
-
-
-
-
- {{ scope.row.姓名 }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.应收金额 }}
-
-
-
-
- {{ scope.row.已收金额 }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ {{ scope.row.合同编号 }}
+
+
+
+
+ {{ scope.row.项目名称 }}
+
+
+
+
+ {{ scope.row.客户名称 }}
+
+
+
+
+ {{ scope.row.付款方式 }}
+
+
+
+
+ {{ Number(scope.row.合同总金额).toFixed(2) }}
+
+
+
+
+ {{ scope.row.姓名 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.应收金额 }}
+
+
+
+
+ {{ scope.row.已收金额 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -411,14 +411,6 @@
姓名：
查询
-
-
-
-
-
-
-
-