fix: 销售订单，发货单修改

src/directives/tableScrollSync.js

@@ -9,6 +9,8 @@ function setupScrollSync(el) {
   if (!table) return null;
 
   const outerWidth = table.offsetWidth;
+
+  // console.log('outerWidth~~~', outerWidth);
   // 取第一个内部 table 的宽度作为内容宽度
   const innerTable = table.querySelector('table');
   const contentWidth = innerTable ? innerTable.offsetWidth : outerWidth;

src/views/financialManage/prepayment/components/addDialog.vue

@@ -197,7 +197,7 @@
        <div style="margin-top: 20px" v-if="isDetail">
         <headerTitle title="付款信息"></headerTitle>
         <div style="margin: 10px 0; font-size: 14px; color: #606266;">
-          <span>预付金额：{{ form.amount || 0 }} 元</span>
+          <span>预付金额：{{ form.prepayTotalPrice || 0 }} 元</span>
           <span style="margin-left: 20px;">已付金额：{{ paidAmount }} 元</span>
           <span style="margin-left: 20px;">未付金额：{{ unpaidAmount }} 元</span>
         </div>
@@ -384,6 +384,19 @@
         ]
       };
     },
+    computed: {
+      paidAmount() {
+        return this.form.tableData.reduce((sum, item) => {
+          const val = parseFloat(item.paidAmount);
+          return sum + (isNaN(val) ? 0 : val);
+        }, 0).toFixed(2);
+      },
+      unpaidAmount() {
+        const total = parseFloat(this.row.prepayTotalPrice) || 0;
+        const paid = parseFloat(this.paidAmount) || 0;
+        return (total - paid).toFixed(2);
+      }
+    },
     methods: {
       generateCode() {
         const now = new Date();

src/views/financialManage/prepayment/index.vue

@@ -127,7 +127,8 @@
     prepaymentPageList,
     deletePrepayment,
     getPrepaymentInfo,
-    withdrawPrepayment
+    withdrawPrepayment,
+    completeInfo
   } from '@/api/financialManage/prepayment';
   import processSubmitDialog from '@/BIZComponents/processSubmitDialog/processSubmitDialog.vue';
 

src/views/financialManage/receivableManage/components/detailDialog.vue

@@ -27,7 +27,7 @@
       <el-form ref="form" :model="form" class="el-form-box" label-width="120px">
         <headerTitle title="基本信息"></headerTitle>
         <el-row :gutter="12">
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="应收日期" prop="receivableDate">
               <el-date-picker
                 style="width: 100%"
@@ -39,7 +39,7 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="应收金额" prop="receivableTotalPrice">
               <el-input-number
                 disabled
@@ -51,9 +51,7 @@
               ></el-input-number>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="12">
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="会计科目" prop="accountingSubjectId">
               <ele-tree-select
                 disabled
@@ -70,14 +68,31 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+        </el-row>
+        <el-row :gutter="12">
+          <el-col :span="8">
             <el-form-item label="发票编码" prop="invoiceCode">
               <el-input disabled v-model="form.invoiceCode"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="发票号" prop="invoiceCode">
+              <el-input disabled v-model="form.invoiceCode"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="发票种类" prop="invoiceCode">
+              <el-input disabled v-model="form.invoiceCode"></el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="12">
-          <el-col :span="12">
+          <el-col :span="8">
+            <el-form-item label="公司名称" prop="contactName">
+              <el-input disabled v-model="form.contactName"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
             <el-form-item label="来源类型" prop="sourceType">
               <el-input
                 :value="payAndReceiveEnum.find(item=>item.value==form.sourceType)?.label"
@@ -85,23 +100,20 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="来源编码" prop="sourceCode">
               <el-input v-model="form.sourceCode" disabled></el-input>
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="公司名称" prop="contactName">
-              <el-input disabled v-model="form.contactName"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
+          </el-row>
+          <el-row :gutter="12">
+          <el-col :span="8">
             <el-form-item label="备注" prop="remark">
               <el-input disabled v-model="form.remark"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="附件">
               <fileMain v-model="form.files" type="view"></fileMain>
             </el-form-item>

src/views/saleManage/saleOrder/components/drawer.vue

@@ -68,7 +68,7 @@
           <entrustedReceive :saleOrderData="row" :key="row.id"></entrustedReceive>
         </el-tab-pane>
         <el-tab-pane label="发货单" name="发货单">
-          <invoice :saleOrderData="row" :key="row.id"></invoice>
+          <invoice v-if="activeName == '发货单'" :saleOrderData="row" :key="row.id"></invoice>
         </el-tab-pane>
         <el-tab-pane label="退货单" name="退货单">
           <returnGoods :saleOrderData="row" :key="row.id"></returnGoods>

src/views/saleManage/saleOrder/invoice/components/searchTable.vue

@@ -1,6 +1,6 @@
 <!-- 搜索表单 -->
 <template>
-  <seekPage :seekList="seekList" :formLength="3" @search="search"></seekPage>
+  <seekPage :seekList="seekList" :formLength="4" @search="search"></seekPage>
 </template>
 <script>
 import { receiptType ,orderStatusOptions} from '@/enum/dict';
@@ -30,6 +30,12 @@ export default {
           type: 'input',
           placeholder: '请输入'
         },
+        {
+          label: '客户名称：',
+          value: 'contactName',
+          type: 'input',
+          placeholder: '请输入'
+        },
         {
           label: '产品名称',
           value: 'productName',
@@ -65,13 +71,6 @@ export default {
           type: 'input',
           placeholder: '请输入'
         },
-        {
-          label: '客户名称：',
-          value: 'contactName',
-          width: 380,
-          type: 'input',
-          placeholder: '请输入'
-        },
         {
           label: '是否回执：',
           value: 'replied',