|
@@ -13,7 +13,7 @@
|
|
|
</div>
|
|
|
<div class="w-32 ml-3">
|
|
|
<el-select
|
|
|
- v-model="searchForm.contractIdValue" block clearable placeholder="合同段" size="large"
|
|
|
+ v-model="searchForm.currentContractId" block clearable placeholder="合同段" size="large"
|
|
|
@change="ContractIdChange"
|
|
|
>
|
|
|
<el-option v-for="item in contractList" :label="item.contractName" :value="item.id" />
|
|
@@ -140,7 +140,7 @@ const useAppState = useAppStore()
|
|
|
const projectId = ref(props.projectId)
|
|
|
const contractId = ref(props.contractId)
|
|
|
const isTableKey = ref(props.tableKey)
|
|
|
-const currentContractId = ref(useAppState.getContractId)
|
|
|
+
|
|
|
|
|
|
//监听
|
|
|
watch(() => [
|
|
@@ -158,7 +158,7 @@ nextTick(() => {
|
|
|
|
|
|
//获取相关数据
|
|
|
const setQueryData = () => {
|
|
|
- searchForm.value.contractIdValue = contractId.value
|
|
|
+ searchForm.value.currentContractId = contractId.value
|
|
|
queryTaskType()
|
|
|
queryTaskStatus()
|
|
|
searchClick()
|
|
@@ -292,8 +292,9 @@ const queryPage = async () => {
|
|
|
tableLoading.value = true
|
|
|
const { error, code, data } = await tasksApi.getTaskPage({
|
|
|
...searchForm.value,
|
|
|
-
|
|
|
- // projectId: projectId.value,
|
|
|
+
|
|
|
+ projectIdValue: projectId.value,
|
|
|
+ contractIdValue:contractId.value,
|
|
|
|
|
|
})
|
|
|
//处理数据
|