diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index 6b1e4638..5cdd64f2 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -992,6 +992,7 @@ export default {
this.form.付款方式 = parseInt(row.付款方式代码)
this.biddingNumber = row.招标保证金流水号
this.form.bidding = row.招标企业
+ this.form.contractAmount = row.合同总金额
this.disabled = true
this.temp = 2
this.isTrue = false
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index aad45b46..ab4a225d 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -16,22 +16,22 @@
-
-
- 刷新 | 待采购零件数
-
-
-
-
-
-
- {{ machine.机床图号 }}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -46,7 +46,7 @@
-
+
-->
- 查询
+ 查询
导出未询价单
-
+
+
+
- 调整采购任务
-
-
-
+
+
+
+
+
+ 确定
+
+ 调整采购任务
+
@@ -1443,7 +1450,7 @@ export default {
where 采购管理_采购合同_采购部.是否未通过 = 0
) as 通过的合同 on 通过的合同.组件零件流水号 = MRP_计划订单_组件零件清单_标准件和外购件_视图.组件零件流水号
left join 采购管理_供应商 on 通过的合同.供应商流水号 = 采购管理_供应商.供应商流水号
- where 询价状态编号 = 1 and 采购状态编号 = 1 and 零件类型 = 2
+ where 询价状态编号 = 1 and 采购状态编号 = 1
and 人员编号 = ${this.id}
group by 项目流水号,机床流水号,机床图号,人员编号
union all
@@ -1715,7 +1722,7 @@ export default {
this.machineValue ? check5 = 1 : check5 = 0
this.groupValue ? check6 = 1 : check6 = 0
this.startTime ? check7 = 1 : (check7 = 0, this.startTime = '')
- searchMaterial(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.startTime[0], this.startTime[1]).then(response => {
+ searchMaterial(this.pageCurrent11, this.pageSize11, 3, check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.startTime[0], this.startTime[1]).then(response => {
this.tableData11 = response.data.rows
this.total11 = response.data.total
const remark = []
@@ -1754,7 +1761,7 @@ export default {
this.machineValue ? check5 = 1 : check5 = 0
this.groupValue ? check6 = 1 : check6 = 0
this.endTime ? check7 = 1 : (check7 = 0, this.endTime = '')
- searchPart(this.pageCurrent12, this.pageSize12, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.endTime[0], this.endTime[1]).then(response => {
+ searchPart(this.pageCurrent12, this.pageSize12, 3, check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.endTime[0], this.endTime[1]).then(response => {
this.tableData12 = response.data.rows
this.total12 = response.data.total
const remark = []
@@ -1789,7 +1796,7 @@ export default {
this.machineValue ? check5 = 1 : check5 = 0
this.groupValue ? check6 = 1 : check6 = 0
this.endTime ? check7 = 1 : (check7 = 0, this.endTime = '')
- searchPart(this.pageCurrent12, this.pageSize12, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.endTime[0], this.endTime[1]).then(response => {
+ searchPart(this.pageCurrent12, this.pageSize12, 3, check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.endTime[0], this.endTime[1]).then(response => {
this.tableData12 = response.data.rows
this.total12 = response.data.total
const remark = []
diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
index d55e39f8..ff1732ee 100644
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -29,7 +29,7 @@
-
+
- 查询
+ 查询
+ 未分配
+ 已分配
采购员:
@@ -113,7 +115,7 @@
-
+
@@ -183,27 +185,27 @@
-
-
- {{ scope.row.物料计划到货时间.split(' ')[0] }}
-
-
-
-
- {{ scope.row.操作日期.split(' ')[0] }}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
{{ scope.row.姓名 ? scope.row.姓名 : '—' }}
-
-
- {{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '—' }}
-
-
-
+
+
+
+
+
+
-
+
- 查询
+ 查询
+ 未分配
+ 已分配
采购员:
@@ -295,7 +299,7 @@
-
+
@@ -365,27 +369,27 @@
-
-
- {{ scope.row.物料计划到货时间.split(' ')[0] }}
-
-
-
-
- {{ scope.row.操作日期.split(' ')[0] }}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
{{ scope.row.姓名 ? scope.row.姓名 : '—' }}
-
-
- {{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '—' }}
-
-
-
+
+
+
+
+
+
-
+
-->
- 查询
+ 查询
+ 未分配
+ 已分配
采购员:
@@ -452,7 +458,7 @@
-
+
@@ -512,27 +518,27 @@
{{ scope.row.供货商 }}
-
-
- {{ scope.row.物料计划到货时间.split(' ')[0] }}
-
-
-
-
- {{ scope.row.操作日期.split(' ')[0] }}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
{{ scope.row.姓名 ? scope.row.姓名 : '—' }}
-
-
- {{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '—' }}
-
-
-
+
+
+
+
+
+
{
for (let i = 0; i < response.data.length; i++) {
this.project.push({
@@ -850,6 +857,7 @@ export default {
}
},
searchTable0() { // 查询标准件
+ this.loading = true
this.MaterialCategoryValue ? this.check1 = 1 : this.check1 = 0
this.MaterialVarietyValue ? this.check2 = 1 : this.check2 = 0
this.projectValue ? this.check3 = 1 : this.check3 = 0
@@ -860,12 +868,14 @@ export default {
this.materialSpec ? check2 = 1 : check2 = 0
this.materialModel ? check3 = 1 : check3 = 0
// this.dateRange ? check4 = 0 : (check4 = 0, this.dateRange = '')
- searchTable1(this.pageCurrent0, this.pageSize0, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1], check2, this.materialSpec, check3, this.materialModel, 1, 0, '', '').then(response => {
+ searchTable1(this.pageCurrent0, this.pageSize0, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, parseInt(this.radio), check2, this.materialSpec, check3, this.materialModel, 1, 0, '', '').then(response => {
this.tableData0 = response.data.rows
this.total0 = response.data.total
+ this.loading = false
})
},
searchTable1() { // 查询外购件
+ this.loading = true
this.MaterialCategoryValue ? this.check1 = 1 : this.check1 = 0
this.MaterialVarietyValue ? this.check2 = 1 : this.check2 = 0
this.projectValue ? this.check3 = 1 : this.check3 = 0
@@ -875,12 +885,14 @@ export default {
this.materialName ? this.check4 = 1 : this.check4 = 0
this.materialSpec ? check2 = 1 : check2 = 0
this.materialModel ? check3 = 1 : check3 = 0
- searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1], check2, this.materialSpec, check3, this.materialModel, 2).then(response => {
+ searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, parseInt(this.radio), check2, this.materialSpec, check3, this.materialModel, 2).then(response => {
this.tableData1 = response.data.rows
this.total1 = response.data.total
+ this.loading = false
})
},
searchTable2() { // 查询基本件
+ this.loading = true
this.projectValue ? this.check3 = 1 : this.check3 = 0
let check1, check2, check3, check4, check5, check6
this.partNum ? check1 = 1 : check1 = 0
@@ -889,9 +901,10 @@ export default {
this.partMaterial ? check4 = 1 : check4 = 0
this.machineValue ? check5 = 1 : check5 = 0
this.groupValue ? check6 = 1 : check6 = 0
- searchTable2(this.pageCurrent2, this.pageSize2, this.check3, this.projectValue, check5, this.machineValue, check6, this.groupValue, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, check4, this.partMaterial).then(response => {
+ searchTable2(this.pageCurrent2, this.pageSize2, this.check3, this.projectValue, check5, this.machineValue, check6, this.groupValue, parseInt(this.radio), check1, this.partNum, check2, this.partName, check3, this.partSpec, check4, this.partMaterial).then(response => {
this.tableData2 = response.data.rows
this.total2 = response.data.total
+ this.loading = false
})
},
handleSelectionChange1(val) { // 标准件和外购件多选
@@ -1086,6 +1099,9 @@ export default {
width:150px;
margin-right: 10px;
}
+ .el-radio{
+ margin-right: 0px;
+ }