档案修改

src/views/archives/manage/tuning.vue

@@ -282,7 +282,7 @@
                 :loading="uploadSaveLoading" is-new ui="hc-form-table" is-check @selection-change="uploadTableSelection"
             >
                 <template #name="{ row }">
-                    <el-input v-model="row.name" :class="row.isFileNumber ? 'is-error' : ''" @input="tableIsInput($event, row, 'name')" />
+                    <el-input v-model="row.name" :class="row.isFileNumber ? 'is-error' : ''" type="textarea" @input="tableIsInput($event, row, 'name')" />
                 </template>
                 <template #fileNumber="{ row }">
                     <el-input v-model="row.fileNumber" :class="row.isFileNumber ? 'is-error' : ''" @input="tableIsInput($event, row, 'isFileNumber')" />
@@ -381,7 +381,13 @@
                 </el-form>
             </div>
         </hc-new-dialog>
-        <!-- 新增并卷弹窗 -->
+        <!-- 新增重组弹窗 -->
+        <hc-new-dialog v-model="mergeModalBefore" :loading="mergeModalBeforeLoading" title="并卷或重组" widths="12vw" @close="mergeModalBeforeClose" @save="mergeModalBeforeClick">
+            <el-radio-group v-model="mergeModalBeforeType">
+                <el-radio value="1" size="large">并卷</el-radio>
+                <el-radio value="2" size="large">重组</el-radio>
+            </el-radio-group>
+        </hc-new-dialog>
         <hc-new-dialog v-model="mergeModal" :loading="combinationClickLoading" widths="50vw" @close="mergeModalClose" @save="combinationClick">
             <template #header>
                 <div class="text-1xl mt-2 text-center font-bold">
@@ -553,7 +559,7 @@ const nodeElTreeClick = ({ node, data, keys, key }) => {
 
     searchForm.value.total = 0
     searchForm.value.current = 1
-    searchForm.value.size = 20
+    // searchForm.value.size = 20
     searchForm.value.nodeIds = data.id || ''
     getTableData()
 }
@@ -1378,6 +1384,7 @@ const combinationClick = async ()=>{
     const { error, code, data, msg } = await tuningApi.reCreateArchiveAuto({
         ids: ids,
         name:mergeInput.value,
+          type:1,
       
     })
     combinationClickLoading.value = false
@@ -1385,10 +1392,46 @@ const combinationClick = async ()=>{
         window.$message?.success(msg)
         getTableData()
           mergeModal.value = false
+          mergeModalBeforeClose()
     } else {
         window.$message?.error(msg)
     }
 }
+const mergeModalBefore = ref(false)
+const mergeModalBeforeLoading = ref(false)
+const mergeModalBeforeClose = ()=>{
+    mergeModalBefore.value = false
+    mergeModalBeforeType.value = ''
+}
+const mergeModalBeforeClick = async ()=>{
+    if (!mergeModalBeforeType.value) return window.$message?.warning('请选择并卷方式')
+    if (mergeModalBeforeType.value === '1') {
+        mergeModal.value = true
+        mergeInput.value = ''
+    } else {
+           
+            mergeModalBeforeLoading.value = true
+            let ids = ''
+            const rows = tableCheckedKeys.value
+            ids = rowsToId(rows)
+            const { error, code, data, msg } = await tuningApi.reCreateArchiveAuto({
+                ids: ids,
+                type:2,
+            
+            })
+            mergeModalBeforeLoading.value = false
+            if (!error && code === 200) {
+                window.$message?.success(msg)
+                getTableData()
+           
+                mergeModalBeforeClose()
+            } else {
+                window.$message?.error(msg)
+            }
+    }
+
+}
+const mergeModalBeforeType = ref('')
 const mergeModal = ref(false)
 
 const mergeInput = ref('')
@@ -1408,8 +1451,9 @@ const mergeClick = ()=>{
         return
     }
     mergeData.value = deepClone(tableCheckedKeys.value)
-     mergeModal.value = true
-     mergeInput.value = ''
+    mergeModalBefore.value = true
+    //  mergeModal.value = true
+    //  mergeInput.value = ''
 }
 const mergeDataColumn = [
        { key: 'fileNumber', name: '档号', width: 160, align: 'center' },

src/views/archives/rolling/rolling.vue

@@ -4,7 +4,7 @@
             <HcTree
                 ref="rollingTreeRef"
                 :auto-expand-keys="treeAutoExpandKeys" :contract-id="contractId" :project-id="projectId"
-                :is-check="true" @node-tap="nodeElTreeClick" @node-loading="treeNodeLoading"
+                @node-tap="nodeElTreeClick" @node-loading="treeNodeLoading"
                 @menu-tap="ElTreeMenuClick"
                 @node-check-change="ECheckChange"
             />