更新
This commit is contained in:
@@ -91,7 +91,12 @@ export function getBuzhuang() {
|
|||||||
UserID: state.state.user.id,
|
UserID: state.state.user.id,
|
||||||
ModularID: router.currentRoute.path,
|
ModularID: router.currentRoute.path,
|
||||||
type: '3',
|
type: '3',
|
||||||
name: 'SELECT 机床图号,组号,任务名称 FROM 车间管理_工作计划 inner join PDM_机床名称 on 车间管理_工作计划.机床流水号=PDM_机床名称.机床流水号 where 计划类型=1 and 是否工作=1 and 组号 <> \'\''
|
name: '\n' +
|
||||||
|
'SELECT dbo.PDM_机床名称.机床图号, dbo.车间管理_工作计划.组号, dbo.车间管理_工作计划.任务名称, dbo.PDM_项目名称.是否启用\n' +
|
||||||
|
'FROM dbo.车间管理_工作计划 INNER JOIN\n' +
|
||||||
|
' dbo.PDM_机床名称 ON dbo.车间管理_工作计划.机床流水号 = dbo.PDM_机床名称.机床流水号 INNER JOIN\n' +
|
||||||
|
' dbo.PDM_项目名称 ON dbo.PDM_机床名称.项目流水号 = dbo.PDM_项目名称.项目流水号\n' +
|
||||||
|
'WHERE (dbo.车间管理_工作计划.计划类型 = 1) AND (dbo.车间管理_工作计划.是否工作 = 1) AND (dbo.车间管理_工作计划.组号 <> \'\') AND (dbo.PDM_项目名称.是否启用 = 1)'
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ export function searchArrivalState(num) {
|
|||||||
UserID: state.state.user.id,
|
UserID: state.state.user.id,
|
||||||
ModularID: router.currentRoute.path,
|
ModularID: router.currentRoute.path,
|
||||||
type: '1',
|
type: '1',
|
||||||
name: '车间管理_到货情况_查询数据_新_成组采购',
|
name: '车间管理_到货情况_查询数据_最新',
|
||||||
param: `采购合同流水号=${num}`
|
param: `采购合同流水号=${num}`
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -173,7 +173,7 @@
|
|||||||
<!-- <el-input v-model="form.department" size="small" placeholder="领料部门" style="width: 200px"/>-->
|
<!-- <el-input v-model="form.department" size="small" placeholder="领料部门" style="width: 200px"/>-->
|
||||||
<!-- </el-form-item>-->
|
<!-- </el-form-item>-->
|
||||||
<el-form-item label="部门" prop="部门" label-width="100px" size="small">
|
<el-form-item label="部门" prop="部门" label-width="100px" size="small">
|
||||||
<el-select v-model="form.department" placeholder="请选择部门" size="small" clearable style="width: 200px;" @change="selectLeaders">
|
<el-select v-model="form.department" filterable placeholder="请选择部门" size="small" clearable style="width: 200px;" @change="selectLeaders">
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in departments"
|
v-for="item in departments"
|
||||||
:key="item.value"
|
:key="item.value"
|
||||||
@@ -182,7 +182,7 @@
|
|||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="领料人" prop="领料人" label-width="100px" size="small">
|
<el-form-item label="领料人" prop="领料人" label-width="100px" size="small">
|
||||||
<el-select v-model="form.DirectNote" placeholder="请选择领料人" size="small" clearable style="width: 200px;">
|
<el-select v-model="form.DirectNote" filterable placeholder="请选择领料人" size="small" clearable style="width: 200px;">
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in DirectNotes"
|
v-for="item in DirectNotes"
|
||||||
:key="item.value"
|
:key="item.value"
|
||||||
|
|||||||
@@ -180,6 +180,7 @@ export default {
|
|||||||
check2 = 1
|
check2 = 1
|
||||||
}
|
}
|
||||||
searchTable(check, this.supplierNameValue, check1, this.MaterialsValue, check2, this.timer[0], this.timer[1], this.pageSize, this.pageCurrent).then(response => {
|
searchTable(check, this.supplierNameValue, check1, this.MaterialsValue, check2, this.timer[0], this.timer[1], this.pageSize, this.pageCurrent).then(response => {
|
||||||
|
console.log(response, 1111)
|
||||||
this.tableData = response.data.result
|
this.tableData = response.data.result
|
||||||
this.total = parseInt(response.data.output[0].ItemCount)
|
this.total = parseInt(response.data.output[0].ItemCount)
|
||||||
this.loading = false
|
this.loading = false
|
||||||
|
|||||||
@@ -633,7 +633,7 @@
|
|||||||
plain
|
plain
|
||||||
icon="el-icon-search"
|
icon="el-icon-search"
|
||||||
style="margin:0px 10px"
|
style="margin:0px 10px"
|
||||||
@click="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">查询</el-button>
|
@click="pageCurrent2=1;pageSize2=100;total2=0;searchTable2()">查询</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
type="distribution"
|
type="distribution"
|
||||||
icon="el-icon-circle-plus-outline"
|
icon="el-icon-circle-plus-outline"
|
||||||
|
|||||||
@@ -474,6 +474,7 @@ export default {
|
|||||||
this.dialogVisible1 = true
|
this.dialogVisible1 = true
|
||||||
},
|
},
|
||||||
searchTable1() {
|
searchTable1() {
|
||||||
|
this.disabled = true
|
||||||
let check1
|
let check1
|
||||||
this.invoiceNum ? check1 = 1 : check1 = 0
|
this.invoiceNum ? check1 = 1 : check1 = 0
|
||||||
searchTable1(check1, this.invoiceNum, this.pageCurrent1, this.pageSize1).then(response => {
|
searchTable1(check1, this.invoiceNum, this.pageCurrent1, this.pageSize1).then(response => {
|
||||||
|
|||||||
Reference in New Issue
Block a user