合并

src/views/design/billofQuantities/index.vue

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

src/views/design/volumeCatalog/index.vue

@@ -151,7 +151,16 @@
           /></el-select>
         </el-form-item>
         <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>
+>>>>>>> 8a3f338e2734575bcb743e917b1232bedc76f105
         </el-form-item>
         <el-form-item v-if="uploadForm.type == '3'" label="抄送人">
           <el-select multiple filterable clearable v-model="form.userIds" placeholder="请选择抄送人">