Просмотр исходного кода

fix: 1. 移除了v-table-scroll-sync指令
2. 修复应收/应付账单的删除、表单禁用逻辑,新增id校验
3. 恢复并优化付款/收款页面的操作按钮和表格列配置
4. 为列表添加已付/已收编码字段,补充请求参数

liujt 1 день назад
Родитель
Сommit
9dab8c89a2

+ 23 - 14
src/views/financialManage/paidManagement/index.vue

@@ -42,7 +42,7 @@
             >
             >
               新增发票
               新增发票
             </el-link>
             </el-link>
-            <el-link
+            <!-- <el-link
               type="primary"
               type="primary"
               v-if="[2].includes(row.approvalStatus)"
               v-if="[2].includes(row.approvalStatus)"
               :underline="false"
               :underline="false"
@@ -50,8 +50,8 @@
               @click="handleCollection(row, 'update')"
               @click="handleCollection(row, 'update')"
             >
             >
               付款
               付款
-            </el-link>
-            <el-link
+            </el-link> -->
+            <!-- <el-link
               type="primary"
               type="primary"
               :underline="false"
               :underline="false"
               icon="el-icon-plus"
               icon="el-icon-plus"
@@ -59,7 +59,7 @@
               v-if="[0, 3].includes(row.approvalStatus)"
               v-if="[0, 3].includes(row.approvalStatus)"
             >
             >
               提交
               提交
-            </el-link>
+            </el-link> -->
           </template>
           </template>
           <!-- 收款信息 -->
           <!-- 收款信息 -->
           <template v-slot:code="{ row }">
           <template v-slot:code="{ row }">
@@ -203,6 +203,14 @@
             columnKey: 'index',
             columnKey: 'index',
             align: 'center'
             align: 'center'
           },
           },
+          {
+            minWidth: 150,
+            prop: 'detailCode',
+            label: '已付编码',
+            align: 'center',
+            slot: 'detailCode',
+            showOverflowTooltip: true
+          },
           {
           {
             minWidth: 150,
             minWidth: 150,
             prop: 'code',
             prop: 'code',
@@ -424,16 +432,16 @@
             }
             }
           },
           },
           
           
-        //   {
-        //     columnKey: 'action',
-        //     label: '操作',
-        //     width: 150,
-        //     align: 'center',
-        //     resizable: false,
-        //     slot: 'action',
-        //     showOverflowTooltip: true,
-        //     fixed: 'right'
-        //   }
+          {
+            columnKey: 'action',
+            label: '操作',
+            width: 150,
+            align: 'center',
+            resizable: false,
+            slot: 'action',
+            showOverflowTooltip: true,
+            fixed: 'right'
+          }
         ];
         ];
       }
       }
     },
     },
@@ -487,6 +495,7 @@
       /* 表格数据源 */
       /* 表格数据源 */
       datasource({ page, limit, where, order }) {
       datasource({ page, limit, where, order }) {
         return finPayablePageListAPI({
         return finPayablePageListAPI({
+          paymentStatus: 1,
           pageNum: page,
           pageNum: page,
           size: limit,
           size: limit,
           ...where
           ...where

+ 2 - 2
src/views/financialManage/payableManage/components/infoTable.vue

@@ -53,11 +53,11 @@
           <el-popconfirm
           <el-popconfirm
             class="ele-action"
             class="ele-action"
             title="确定要删除此信息吗?"
             title="确定要删除此信息吗?"
-            v-if="dialogType !== 'view'"
+            v-if="dialogType !== 'view' && !row?.id"
             @confirm="handleDelInfo($index)"
             @confirm="handleDelInfo($index)"
           >
           >
             <template v-slot:reference="scope">
             <template v-slot:reference="scope">
-              <el-link v-if="!scope.row?.id" type="danger" :underline="false" icon="el-icon-delete">
+              <el-link type="danger" :underline="false" icon="el-icon-delete">
                 删除
                 删除
               </el-link>
               </el-link>
             </template>
             </template>

+ 5 - 5
src/views/financialManage/receivableManage/components/infoTable.vue

@@ -54,7 +54,7 @@
             class="ele-action"
             class="ele-action"
             title="确定要删除此信息吗?"
             title="确定要删除此信息吗?"
             @confirm="handleDelInfo($index)"
             @confirm="handleDelInfo($index)"
-            v-if="dialogType !== 'view' && !row.invoiceCode"
+            v-if="dialogType !== 'view' && !row.invoiceCode && !row?.id"
           >
           >
             <template v-slot:reference>
             <template v-slot:reference>
               <el-link type="danger" :underline="false" icon="el-icon-delete">
               <el-link type="danger" :underline="false" icon="el-icon-delete">
@@ -81,7 +81,7 @@
               type="date"
               type="date"
               value-format="yyyy-MM-dd"
               value-format="yyyy-MM-dd"
               placeholder="选择日期"
               placeholder="选择日期"
-              :disabled="!!row.invoiceCode"
+              :disabled="!!row.invoiceCode || !!row?.id"
             >
             >
             </el-date-picker>
             </el-date-picker>
           </el-form-item>
           </el-form-item>
@@ -101,7 +101,7 @@
             <el-input-number
             <el-input-number
               @change="(val, oldVal) => handlePrice(val, oldVal, row, $index)"
               @change="(val, oldVal) => handlePrice(val, oldVal, row, $index)"
               v-model="row.receivedTotalPrice"
               v-model="row.receivedTotalPrice"
-              :disabled="!!row.invoiceCode"
+              :disabled="!!row.invoiceCode || !!row?.id"
               :controls="false"
               :controls="false"
               :precision="2"
               :precision="2"
               :min="0.0"
               :min="0.0"
@@ -113,7 +113,7 @@
           <el-form-item :prop="'detailList.' + $index + '.files'">
           <el-form-item :prop="'detailList.' + $index + '.files'">
             <fileMain
             <fileMain
               v-model="row.files"
               v-model="row.files"
-              :type="dialogType == 'view' || row.invoiceCode ? 'view' : 'add'"
+              :type="dialogType == 'view' || row.invoiceCode || row?.id ? 'view' : 'add'"
             ></fileMain>
             ></fileMain>
           </el-form-item>
           </el-form-item>
         </template>
         </template>
@@ -123,7 +123,7 @@
             <el-input
             <el-input
               v-model="row.remark"
               v-model="row.remark"
               type="textarea"
               type="textarea"
-              :disabled="!!row.invoiceCode"
+              :disabled="!!row.invoiceCode || !!row?.id"
             ></el-input>
             ></el-input>
           </el-form-item>
           </el-form-item>
         </template>
         </template>

+ 25 - 16
src/views/financialManage/receivedManaged/index.vue

@@ -51,7 +51,7 @@
             >
             >
               提交
               提交
             </el-link> -->
             </el-link> -->
-            <!-- <el-link
+            <el-link
               type="primary"
               type="primary"
               :underline="false"
               :underline="false"
               icon="el-icon-plus"
               icon="el-icon-plus"
@@ -59,7 +59,7 @@
               v-if="canAddInvoice(row)"
               v-if="canAddInvoice(row)"
             >
             >
               新增发票
               新增发票
-            </el-link> -->
+            </el-link>
           </template>
           </template>
           <!-- 收款信息 -->
           <!-- 收款信息 -->
           <template v-slot:code="{ row }">
           <template v-slot:code="{ row }">
@@ -110,13 +110,13 @@
       @reload="reload"
       @reload="reload"
     ></process-submit-dialog>
     ></process-submit-dialog>
     <!-- 开票 -->
     <!-- 开票 -->
-    <!-- <addOrEditDialogNew
+    <addOrEditDialogNew
       ref="addOrEditDialogNewRef"
       ref="addOrEditDialogNewRef"
       :add-or-edit-dialog-flag.sync="addOrEditDialogNewFlag"
       :add-or-edit-dialog-flag.sync="addOrEditDialogNewFlag"
       v-if="addOrEditDialogNewFlag"
       v-if="addOrEditDialogNewFlag"
       :isEditType="false"
       :isEditType="false"
       @reload="reload"
       @reload="reload"
-    /> -->
+    />
   </div>
   </div>
 </template>
 </template>
 
 
@@ -132,7 +132,7 @@
   import processSubmitDialog from "@/BIZComponents/processSubmitDialog/processSubmitDialog.vue";
   import processSubmitDialog from "@/BIZComponents/processSubmitDialog/processSubmitDialog.vue";
   import tabMixins from '@/mixins/tableColumnsMixin';
   import tabMixins from '@/mixins/tableColumnsMixin';
   import { shippingModeOp, transactionMethodsOp, paymentTypeOp, paymentStatus, invoiceStatusOp } from '@/enum/dict.js';
   import { shippingModeOp, transactionMethodsOp, paymentTypeOp, paymentStatus, invoiceStatusOp } from '@/enum/dict.js';
-//   import addOrEditDialogNew from '@/views/financialManage/invoiceManage/components/addOrEditDialogNew.vue'
+  import addOrEditDialogNew from '@/views/financialManage/invoiceManage/components/addOrEditDialogNew.vue'
 
 
   export default {
   export default {
     mixins: [dictMixins,tabMixins],
     mixins: [dictMixins,tabMixins],
@@ -142,7 +142,7 @@
       detailDialog,
       detailDialog,
       invoiceDetailDialog,
       invoiceDetailDialog,
       processSubmitDialog,
       processSubmitDialog,
-    //   addOrEditDialogNew
+      addOrEditDialogNew
     },
     },
     //客户管理数据
     //客户管理数据
     props: {
     props: {
@@ -210,6 +210,14 @@
             columnKey: 'index',
             columnKey: 'index',
             align: 'center'
             align: 'center'
           },
           },
+          {
+            minWidth: 150,
+            prop: 'detailCode',
+            label: '已收编码',
+            align: 'center',
+            slot: 'detailCode',
+            showOverflowTooltip: true
+          },
           {
           {
             minWidth: 150,
             minWidth: 150,
             prop: 'code',
             prop: 'code',
@@ -431,16 +439,16 @@
             }
             }
           },
           },
           
           
-        //   {
-        //     columnKey: 'action',
-        //     label: '操作',
-        //     width: 150,
-        //     align: 'center',
-        //     resizable: false,
-        //     slot: 'action',
-        //     showOverflowTooltip: true,
-        //     fixed: 'right'
-        //   }
+          {
+            columnKey: 'action',
+            label: '操作',
+            width: 150,
+            align: 'center',
+            resizable: false,
+            slot: 'action',
+            showOverflowTooltip: true,
+            fixed: 'right'
+          }
         ];
         ];
       },
       },
       canAddInvoice() {
       canAddInvoice() {
@@ -507,6 +515,7 @@
           where['saleOrderCode'] = this.saleOrderData.orderNo;
           where['saleOrderCode'] = this.saleOrderData.orderNo;
         }
         }
         return finReceivablePageListAPI({
         return finReceivablePageListAPI({
+          receiptStatus: 1,
           pageNum: page,
           pageNum: page,
           size: limit,
           size: limit,
           ...where
           ...where

+ 1 - 1
src/views/saleManage/saleOrder/invoice/index.vue

@@ -4,7 +4,7 @@
       <div class="ele-border-lighter form-content" v-loading="loading">
       <div class="ele-border-lighter form-content" v-loading="loading">
         <search-table @search="reload"></search-table>
         <search-table @search="reload"></search-table>
 
 
-        <div v-table-scroll-sync>
+        <div>
           <!-- 数据表格 -->
           <!-- 数据表格 -->
           <ele-pro-table
           <ele-pro-table
             ref="table"
             ref="table"