Explorar o código

跟单、平台应收批量修改功能修改比例和导入修改拆分成两个业务窗口

@dongkboy hai 2 semanas
pai
achega
e00d20f0e2
Modificáronse 2 ficheiros con 26 adicións e 14 borrados
  1. 9 5
      src/views/platform/index.vue
  2. 17 9
      src/views/receivable/documentary/index.vue

+ 9 - 5
src/views/platform/index.vue

@@ -144,7 +144,10 @@
           <span class="col-108 m-r-8">
           <span class="col-108 m-r-8">
             <el-button class="radius-2px width-100"
             <el-button class="radius-2px width-100"
               :disabled="selectedList.some(item => item.settlementStatusName === '已结算')"
               :disabled="selectedList.some(item => item.settlementStatusName === '已结算')"
-              @click="handleBatchEdit">批量修改</el-button>
+              @click="handleBatchEdit('first')">批量修改</el-button>
+          </span>
+          <span class="col-108 m-r-8">
+            <el-button class="radius-2px width-100" @click="handleBatchEdit('second')">导入修改</el-button>
           </span>
           </span>
           <span class="col-108 m-r-8">
           <span class="col-108 m-r-8">
             已选: <span class="text-red">{{ selectedList.length }}</span> 条
             已选: <span class="text-red">{{ selectedList.length }}</span> 条
@@ -309,7 +312,7 @@
     </el-dialog>
     </el-dialog>
     <el-dialog :close-on-click-modal="false" title="批量修改" v-model="batchEditShow" width="700">
     <el-dialog :close-on-click-modal="false" title="批量修改" v-model="batchEditShow" width="700">
       <el-tabs v-model="subActiveName" class="demo-tabs">
       <el-tabs v-model="subActiveName" class="demo-tabs">
-        <el-tab-pane label="User" name="first">
+        <el-tab-pane label="User" name="first" v-if="subActiveName === 'first'">
           <template #label>选中修改({{ selectedList.length }})</template>
           <template #label>选中修改({{ selectedList.length }})</template>
           <el-form :model="editForm">
           <el-form :model="editForm">
             <el-row :gutter="20">
             <el-row :gutter="20">
@@ -382,7 +385,7 @@
             </el-row>
             </el-row>
           </el-form>
           </el-form>
         </el-tab-pane>
         </el-tab-pane>
-        <el-tab-pane label="Config" name="second">
+        <el-tab-pane label="Config" name="second" v-if="subActiveName === 'second'">
           <template #label>导入修改</template>
           <template #label>导入修改</template>
           <div style="display: flex; align-items: center; justify-content: center; margin-bottom: 10px">
           <div style="display: flex; align-items: center; justify-content: center; margin-bottom: 10px">
             下载「标准导入模板」,编辑后上传;系统将自动匹配相关字段
             下载「标准导入模板」,编辑后上传;系统将自动匹配相关字段
@@ -766,8 +769,8 @@ let feeRate = ref(null)
 let signTime = ref(null)
 let signTime = ref(null)
 let people = ref(null)
 let people = ref(null)
 let editForm = ref({})
 let editForm = ref({})
-const handleBatchEdit = () => {
-  if (selectedList.value.length < 1) {
+const handleBatchEdit = (str: string) => {
+  if (selectedList.value.length < 1 && str === 'first') {
     ElMessage({
     ElMessage({
       message: '请选择数据!',
       message: '请选择数据!',
       type: 'warning'
       type: 'warning'
@@ -777,6 +780,7 @@ const handleBatchEdit = () => {
   editForm.value = {}
   editForm.value = {}
   importModifyCallback.value = null
   importModifyCallback.value = null
   batchEditShow.value = true
   batchEditShow.value = true
+  subActiveName.value = str
 }
 }
 
 
 const handleBatchEditSubmit = async () => {
 const handleBatchEditSubmit = async () => {

+ 17 - 9
src/views/receivable/documentary/index.vue

@@ -130,7 +130,10 @@
           <span class="col-108 m-r-8">
           <span class="col-108 m-r-8">
             <el-button class="radius-2px width-100"
             <el-button class="radius-2px width-100"
               :disabled="selectedList.some(item => item.invoiceStatusName === '已开票' || item.disableFlag === '1')"
               :disabled="selectedList.some(item => item.invoiceStatusName === '已开票' || item.disableFlag === '1')"
-              @click="handleBatchEdit">批量修改</el-button>
+              @click="handleBatchEdit('first')">批量修改</el-button>
+          </span>
+          <span class="col-108 m-r-8">
+            <el-button class="radius-2px width-100" @click="handleBatchEdit('second')">导入修改</el-button>
           </span>
           </span>
           <span class="col-108 m-r-8">
           <span class="col-108 m-r-8">
             <el-dropdown class="width-100" trigger="click" placement="bottom" @command="dropdownCommand">
             <el-dropdown class="width-100" trigger="click" placement="bottom" @command="dropdownCommand">
@@ -325,7 +328,10 @@
             <el-button class="radius-2px width-100" type="primary" @click="handleExport(2)">导出</el-button>
             <el-button class="radius-2px width-100" type="primary" @click="handleExport(2)">导出</el-button>
           </div>
           </div>
           <span class="col-108 m-r-8">
           <span class="col-108 m-r-8">
-            <el-button class="radius-2px width-100" @click="handleBatchEdit">批量修改</el-button>
+            <el-button class="radius-2px width-100" @click="handleBatchEdit('first')">批量修改</el-button>
+          </span>
+          <span class="col-108 m-r-8">
+            <el-button class="radius-2px width-100" @click="handleBatchEdit('second')">导入修改</el-button>
           </span>
           </span>
           <span class="col-108 m-r-8">
           <span class="col-108 m-r-8">
             已选: <span class="text-red">{{ selectedList.length }}</span> 条
             已选: <span class="text-red">{{ selectedList.length }}</span> 条
@@ -378,7 +384,7 @@
                       <el-dropdown-item command="数据导入">数据导入</el-dropdown-item>
                       <el-dropdown-item command="数据导入">数据导入</el-dropdown-item>
                     </el-dropdown-menu>
                     </el-dropdown-menu>
                   </template>
                   </template>
-                </el-dropdown> -->
+      </el-dropdown> -->
               </div>
               </div>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
@@ -471,8 +477,8 @@
       </template>
       </template>
     </el-dialog>
     </el-dialog>
     <el-dialog :close-on-click-modal="false" title="批量修改" v-model="batchEditShow" width="700">
     <el-dialog :close-on-click-modal="false" title="批量修改" v-model="batchEditShow" width="700">
-      <el-tabs v-model="subActiveName" class="demo-tabs">
-        <el-tab-pane label="User" name="first">
+      <el-tabs v-model="subActiveName" class="demo-tabs" >
+        <el-tab-pane label="User" name="first" v-if="subActiveName === 'first'">
           <template #label>选中修改({{ selectedList.length }})</template>
           <template #label>选中修改({{ selectedList.length }})</template>
           <el-form :model="editForm">
           <el-form :model="editForm">
             <el-row :gutter="20">
             <el-row :gutter="20">
@@ -523,7 +529,7 @@
             </el-row>
             </el-row>
           </el-form>
           </el-form>
         </el-tab-pane>
         </el-tab-pane>
-        <el-tab-pane label="Config" name="second">
+        <el-tab-pane label="Config" name="second" v-if="subActiveName === 'second'">
           <template #label>导入修改</template>
           <template #label>导入修改</template>
           <div style="display: flex; align-items: center; justify-content: center; margin-bottom: 10px">
           <div style="display: flex; align-items: center; justify-content: center; margin-bottom: 10px">
             下载「标准导入模板」,编辑后上传;系统将自动匹配相关字段
             下载「标准导入模板」,编辑后上传;系统将自动匹配相关字段
@@ -552,7 +558,7 @@
       </el-tabs>
       </el-tabs>
       <template #footer>
       <template #footer>
         <el-button class="border-[#0083FF] color-[#0083FF]" plain @click="batchEditShow = false">取消</el-button>
         <el-button class="border-[#0083FF] color-[#0083FF]" plain @click="batchEditShow = false">取消</el-button>
-        <el-button type="primary" @click="handleBatchEditSubmit()">确定</el-button>
+        <el-button type="primary" v-if="subActiveName === 'first'" @click="handleBatchEditSubmit()">确定</el-button>
       </template>
       </template>
     </el-dialog>
     </el-dialog>
   </PageMain>
   </PageMain>
@@ -918,8 +924,8 @@ let feeRate = ref(null)
 let signTime = ref(null)
 let signTime = ref(null)
 let people = ref(null)
 let people = ref(null)
 let editForm = ref({})
 let editForm = ref({})
-const handleBatchEdit = () => {
-  if (selectedList.value.length < 1) {
+const handleBatchEdit = (str: string) => {
+  if (selectedList.value.length < 1 && str === 'first') {
     ElMessage({
     ElMessage({
       message: '请选择数据!',
       message: '请选择数据!',
       type: 'warning'
       type: 'warning'
@@ -927,7 +933,9 @@ const handleBatchEdit = () => {
     return
     return
   }
   }
   editForm.value = {}
   editForm.value = {}
+  importModifyCallback.value = null
   batchEditShow.value = true
   batchEditShow.value = true
+  subActiveName.value = str
 }
 }
 
 
 const handleBatchEditSubmit = async () => {
 const handleBatchEditSubmit = async () => {