diff --git a/src/api/WorkshopProcurement/ProcurementContractApproval.js b/src/api/WorkshopProcurement/ProcurementContractApproval.js
index 93ed84ff..5992fc60 100644
--- a/src/api/WorkshopProcurement/ProcurementContractApproval.js
+++ b/src/api/WorkshopProcurement/ProcurementContractApproval.js
@@ -7,7 +7,7 @@ export function initContract() {
method: 'post',
data: {
type: '1',
- name: '采购管理_采购合同_查询_cjn'
+ name: '车间采购管理_采购合同_查询_cjn'
}
})
}
diff --git a/src/api/WorkshopProcurement/ProcurementContractEnquiry.js b/src/api/WorkshopProcurement/ProcurementContractEnquiry.js
index f27db9ed..5034b36b 100644
--- a/src/api/WorkshopProcurement/ProcurementContractEnquiry.js
+++ b/src/api/WorkshopProcurement/ProcurementContractEnquiry.js
@@ -7,7 +7,7 @@ export function initContract() {
method: 'post',
data: {
type: '1',
- name: '采购管理_采购合同_查询_cjn'
+ name: '车间采购管理_采购合同_查询_cjn'
}
})
}
diff --git a/src/api/WorkshopProcurement/PurchaseContractChange.js b/src/api/WorkshopProcurement/PurchaseContractChange.js
index 05bf1b08..0b7866af 100644
--- a/src/api/WorkshopProcurement/PurchaseContractChange.js
+++ b/src/api/WorkshopProcurement/PurchaseContractChange.js
@@ -11,6 +11,17 @@ export function initContract() {
}
})
}
+// 初始化合同号
+export function initContract1() {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '车间采购管理_采购合同变更_合同初始化'
+ }
+ })
+}
// 初始化采购员(考核部门编号:采购部:2)
export function initBuyer() {
return request({
@@ -56,7 +67,7 @@ export function searchTable3(pageCurrent, pageSize, check1, start, end, check2,
data: {
type: '1',
name: '车间采购管理_采购合同变更_查询数据_根据条件_cjn',
- param: '时间段_check=' + check1 + '&开始时间=' + start + '=datetime&结束时间=' + end + '=datetime&采购合同流水号_check=' + check2 + '&采购合同流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier,
+ param: '时间段_check=' + check1 + '&开始时间=' + start + '=datetime&结束时间=' + end + '=datetime&采购合同变更流水号_check=' + check2 + '&采购合同变更流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier,
Pagination: pageCurrent + '&' + pageSize
}
})
diff --git a/src/utils/request.js b/src/utils/request.js
index 9b106373..543826d2 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -10,8 +10,8 @@ export const name = `OP8888`
export const upload = `http://123.56.95.229:8411/submit/uploadFile.ashx`
export const download = `http://123.56.95.229:8411/submit/downloadFile.ashx`
const service = axios.create({
- baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
- // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
+ // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
+ baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})
diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue
index f1babfd4..2c647011 100644
--- a/src/views/ManufacturingCenter/PartAssignment/index.vue
+++ b/src/views/ManufacturingCenter/PartAssignment/index.vue
@@ -582,6 +582,11 @@ export default {
searchDetailed(row) {
this.RequisitionList = row.请购单流水号
searchDetailed(row.请购单流水号).then(response => {
+ for (let i = 0; i < response.data.length; i++) {
+ if (response.data[i].物料计划到货时间 !== '') {
+ response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
+ }
+ }
this.tableData5 = response.data
})
},
diff --git a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
index 3eae8017..21455284 100644
--- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
+++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
@@ -591,6 +591,7 @@ export default {
this.getSelect(initPurchaseOrder, ['请购单编号', '请购单流水号'], 'contractNum')
},
searchSupplier() { // 查询创立日期和注册资本大于符合条件的数据
+ console.log(this.id)
this.supplierName ? this.supplierCheck1 = 1 : (this.supplierCheck1 = 0, this.supplierName = '')
this.enterpriseNature ? this.supplierCheck2 = 1 : (this.supplierCheck2 = 0, this.enterpriseNature = '')
this.createDate ? this.supplierCheck3 = 1 : (this.supplierCheck3 = 0, this.createDate = '')
diff --git a/src/views/WorkshopProcurement/PurchaseContractChange/index.vue b/src/views/WorkshopProcurement/PurchaseContractChange/index.vue
index 3cc52b00..21828f71 100644
--- a/src/views/WorkshopProcurement/PurchaseContractChange/index.vue
+++ b/src/views/WorkshopProcurement/PurchaseContractChange/index.vue
@@ -152,9 +152,9 @@
start-placeholder="开始日期"
end-placeholder="结束日期"/>
合同号:
-
+
@@ -167,7 +167,7 @@
供应商:
-
+