taoge_xiaodi/td_official
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并

Browse Source
This commit is contained in:
taoge1020
2025-09-02 19:16:42 +08:00
parent 46f9c0568c ddccc64586
commit 069841ea99
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/design/billofQuantities/index.vue
View File

@ -242,10 +242,10 @@ async function handleSheetName() {
// 获取列表 // 获取列表
async function handleQueryList(isSheet = true) { async function handleQueryList(isSheet = true) {
if (isSheet && !state.queryForm.sheet) { // if (isSheet && !state.queryForm) {
console.warn('表名不存在，无法获取列表数据'); // console.warn('表名不存在，无法获取列表数据');
return; // return;
} // }
try { try {
state.loading.list = true; state.loading.list = true;
@ -303,7 +303,7 @@ function handleChange(sheet) {
function handleChangeVersion(versions) { function handleChangeVersion(versions) {
state.queryForm.versions = versions; state.queryForm.versions = versions;
state.versionsData = state.options.find((e) => e.versions == versions); state.versionsData = state.options.find((e) => e.versions == versions);
console.log('state.versionsData', state.versionsData); // console.log('state.versionsData', state.versionsData);
state.sheets = []; state.sheets = [];
handleQueryList(); handleQueryList();
} }

9
src/views/design/volumeCatalog/index.vue
View File

@ -151,7 +151,16 @@
/></el-select> /></el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="uploadForm.type == '3'" label="蓝图" prop="fileIds"> <el-form-item v-if="uploadForm.type == '3'" label="蓝图" prop="fileIds">
<<<<<<< HEAD
<file-upload
:fileType="['pdf']"
:isShowTip="false"
:fileSize="100"
. v-model="uploadForm.fileIds"
></file-upload>
=======
<file-upload :fileType="['pdf']" :isShowTip="false" :fileSize="100" v-model="uploadForm.fileIds"></file-upload> <file-upload :fileType="['pdf']" :isShowTip="false" :fileSize="100" v-model="uploadForm.fileIds"></file-upload>
>>>>>>> 8a3f338e2734575bcb743e917b1232bedc76f105
</el-form-item> </el-form-item>
<el-form-item v-if="uploadForm.type == '3'" label="抄送人"> <el-form-item v-if="uploadForm.type == '3'" label="抄送人">
<el-select multiple filterable clearable v-model="form.userIds" placeholder="请选择抄送人"> <el-select multiple filterable clearable v-model="form.userIds" placeholder="请选择抄送人">