|
@@ -43,7 +43,7 @@
|
|
<el-text class="">负责人:</el-text>
|
|
<el-text class="">负责人:</el-text>
|
|
<el-select class="width160" v-model="data.params.responsibility_person_id" clearable
|
|
<el-select class="width160" v-model="data.params.responsibility_person_id" clearable
|
|
placeholder="请选择负责人" @change="getList">
|
|
placeholder="请选择负责人" @change="getList">
|
|
- <el-option :label="item.real_name" :value="item.id" v-for="item in data.repertoryList" />
|
|
|
|
|
|
+ <el-option :label="item.real_name" :value="item.id" v-for="item in data.projects" />
|
|
</el-select>
|
|
</el-select>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="6" class="tr">
|
|
<el-col :span="6" class="tr">
|
|
@@ -165,14 +165,14 @@
|
|
<el-form-item label="责任人" prop="responsibility_person_id"
|
|
<el-form-item label="责任人" prop="responsibility_person_id"
|
|
:rules="[{ required: true, message: '填写责任人', trigger: 'blur' }]">
|
|
:rules="[{ required: true, message: '填写责任人', trigger: 'blur' }]">
|
|
<el-select v-model="data.form.responsibility_person_id" placeholder="选择责任人">
|
|
<el-select v-model="data.form.responsibility_person_id" placeholder="选择责任人">
|
|
- <el-option :label="item.real_name" :value="item.id" v-for="item in data.repertoryList" />
|
|
|
|
|
|
+ <el-option :label="item.real_name" :value="item.id" v-for="item in data.projects" />
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="参与人员" prop="participants_id"
|
|
<el-form-item label="参与人员" prop="participants_id"
|
|
:rules="[{ required: true, message: '填写参与人员', trigger: 'blur' }]">
|
|
:rules="[{ required: true, message: '填写参与人员', trigger: 'blur' }]">
|
|
<el-select v-model="data.form.participants_id" multiple placeholder="选择参与人员" clearable
|
|
<el-select v-model="data.form.participants_id" multiple placeholder="选择参与人员" clearable
|
|
filterable :style="{ width: '70%' }">
|
|
filterable :style="{ width: '70%' }">
|
|
- <el-option v-for="item in data.repertoryList" :key="item.id" :label="item.real_name"
|
|
|
|
|
|
+ <el-option v-for="item in data.projects" :key="item.id" :label="item.real_name"
|
|
:value="item.id" />
|
|
:value="item.id" />
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -297,7 +297,7 @@
|
|
<el-form-item label="进度负责人" prop="updater_id"
|
|
<el-form-item label="进度负责人" prop="updater_id"
|
|
:rules="[{ required: true, message: '选择进度负责人', trigger: 'blur' }]">
|
|
:rules="[{ required: true, message: '选择进度负责人', trigger: 'blur' }]">
|
|
<el-select v-model="data.formList.updater_id" placeholder="选择进度负责人">
|
|
<el-select v-model="data.formList.updater_id" placeholder="选择进度负责人">
|
|
- <el-option :label="item.real_name" :value="item.id" v-for="item in data.repertoryList" />
|
|
|
|
|
|
+ <el-option :label="item.real_name" :value="item.id" v-for="item in data.projects" />
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="开始时间" prop="start_date">
|
|
<el-form-item label="开始时间" prop="start_date">
|
|
@@ -356,7 +356,7 @@
|
|
<el-form-item label="进度负责人" prop="updater_id"
|
|
<el-form-item label="进度负责人" prop="updater_id"
|
|
:rules="[{ required: true, message: '选择进度负责人', trigger: 'blur' }]">
|
|
:rules="[{ required: true, message: '选择进度负责人', trigger: 'blur' }]">
|
|
<el-select v-model="data.formList.updater_id" placeholder="选择进度负责人">
|
|
<el-select v-model="data.formList.updater_id" placeholder="选择进度负责人">
|
|
- <el-option :label="item.real_name" :value="item.id" v-for="item in data.repertoryList" />
|
|
|
|
|
|
+ <el-option :label="item.real_name" :value="item.id" v-for="item in data.projects" />
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="开始时间" prop="start_date">
|
|
<el-form-item label="开始时间" prop="start_date">
|
|
@@ -718,12 +718,12 @@ let data = reactive({
|
|
formList: {} as any, //新增和修改进度数据
|
|
formList: {} as any, //新增和修改进度数据
|
|
formContract: {} as any, //新增和修改合同数据
|
|
formContract: {} as any, //新增和修改合同数据
|
|
formStatus: {} as any, //新增和修改状态数据
|
|
formStatus: {} as any, //新增和修改状态数据
|
|
- repertoryList: [] as any,//参与人员列表
|
|
|
|
|
|
+ projects: [] as any,//参与人员列表
|
|
});
|
|
});
|
|
/**
|
|
/**
|
|
* 上传
|
|
* 上传
|
|
*/
|
|
*/
|
|
-const ImportExcelDialog = defineAsyncComponent(() => import("/@/views/payrollModule/import.vue"));
|
|
|
|
|
|
+const ImportExcelDialog = defineAsyncComponent(() => import("/@/components/files/import.vue"));
|
|
const importExcelDialogRef = ref();
|
|
const importExcelDialogRef = ref();
|
|
const importExcel = () => {
|
|
const importExcel = () => {
|
|
importExcelDialogRef.value.openDialog();
|
|
importExcelDialogRef.value.openDialog();
|
|
@@ -833,11 +833,11 @@ const search = async () => {
|
|
const init = async () => {
|
|
const init = async () => {
|
|
await Repertory.statuslist({});
|
|
await Repertory.statuslist({});
|
|
|
|
|
|
- let Repertoryres = await Repertory.all({});
|
|
|
|
- if (Repertoryres.code != 0) {
|
|
|
|
|
|
+ let res = await Repertory.all({});
|
|
|
|
+ if (res.code != 0) {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
- data.repertoryList = Repertoryres.data;
|
|
|
|
|
|
+ data.projects = res.data;
|
|
|
|
|
|
};
|
|
};
|
|
/**
|
|
/**
|