部分功能修改

src/components/PDF/CostControlPDF.vue

@@ -4,12 +4,20 @@
       <!-- <div class="title">
         费控
       </div> -->
-      <div class="title-info">
+      <!-- <div class="title-info">
         <div class="vertical-bar"></div>
         <div class="content">费控</div>
-      </div>
+      </div> -->
 
       <table border="1" style="width: 100%;" class="table">
+        <tr style="border-top:1px solid #fff;border-left:1px solid #fff;border-right:1px solid #fff;">
+          <td :colspan="4">
+            <div class="title-info">
+              <div class="vertical-bar"></div>
+              <div class="content" style="font-size:32px;color:#333333">费控-{{pdfData.costTypeName}}</div>
+            </div>
+          </td>
+        </tr>
         <tr>
           <td :colspan="4">
             <div style="font-weight:700;text-align:center;font-size:16px">
@@ -29,7 +37,7 @@
           <td style="width:15%">流水号</td>
           <td style="width:35%">{{pdfData.code}}</td>
         </tr>
-        <tr v-if="isShowAtt('isAdvance', 'mainObj') || isShowAtt('isVoucher', 'mainObj') ">
+        <tr v-if="isShowAtt('isAdvance', 'mainObj') || isShowAtt('isVoucher', 'mainObj')">
           <td style="width:15%" v-if="isShowAtt('isAdvance', 'mainObj')">是否预付</td>
           <td style="width:35%" v-if="isShowAtt('isAdvance', 'mainObj')" :colspan="isShowAtt('isVoucher', 'mainObj')?1:3">
             {{dictValueLabel(pdfData.isAdvance ,isAfterSubmit)}}</td>
@@ -45,7 +53,9 @@
         </tr>
         <tr>
           <td style="width:15%">申请人</td>
-          <td style="width:35%" :colspan="3">{{pdfData.applyUserName}}</td>
+          <td style="width:35%" :colspan="isShowAtt('contractId', 'mainObj')?1:3">{{pdfData.applyUserName}}</td>
+          <td style="width:15%" v-if="isShowAtt('contractId', 'mainObj')">销售订单</td>
+          <td style="width:35%" v-if="isShowAtt('contractId', 'mainObj')">{{pdfData.contractCode}}</td>
         </tr>
         <tr>
           <td :colspan="4">
@@ -306,7 +316,7 @@
               :colspan="isShowAtt('paymentAccountId', 'mainObj')?1:3">{{pdfData.shopName}}</td>
           <td style="width:15%" v-if="isShowAtt('paymentAccountId', 'mainObj')">公司账户</td>
           <td style="width:35%" v-if="isShowAtt('paymentAccountId', 'mainObj')"
-              :colspan="(isShowAtt('paymentMethod', 'mainObj') && pdfData.paymentMethod == '1')?1:3">{{pdfData.paymentAccountId}}</td>
+              :colspan="(isShowAtt('paymentMethod', 'mainObj') && pdfData.paymentMethod == '1')?1:3">{{pdfData.paymentAccountManagementName}}</td>
         </tr>
         <tr v-if="isShowAtt('paymentAccountId', 'mainObj')">
           <td style="width:15%">开户行</td>
@@ -530,7 +540,7 @@ const exportExcel = () => {
 .title-info {
   text-align: center;
   width: 100%;
-  margin: 20px 0 50px 0;
+  margin: 10px 0 40px 0;
   .vertical-bar {
     width: 6px;
     height: 18px;

src/components/byForm/index.vue

@@ -116,7 +116,7 @@
               <el-icon v-if="i.listType=='picture-card'">
                 <Plus />
               </el-icon>
-              <span v-else-if="formOption.disabled" style="color:#409EFF">已上传：</span>
+              <!-- <span v-else-if="formOption.disabled" style="color:#409EFF">已上传：</span> -->
               <el-button type="primary" plain v-else>点击上传</el-button>
             </el-upload>
           </div>

src/components/process/SF/CostControl.vue

@@ -2034,7 +2034,9 @@ const handleSubmit = async (isStag = false) => {
         }
         row.calculateItemList = calculateItemList;
       }
-      formData.data.companyId = formData.data.companyId.join(",");
+      if (Array.isArray(formData.data.companyId)) {
+        formData.data.companyId = formData.data.companyId.join(",");
+      }
       return true;
     } else {
       proxy.msgTip("请添加收付款明细");

src/views/finance/fundManage/accountPayment/index.vue

@@ -213,7 +213,7 @@ const config = computed(() => {
     {
       attrs: {
         label: "业务公司",
-        prop: "companyName",
+        prop: "corporationName",
         width: 110,
       },
     },
@@ -276,14 +276,14 @@ const config = computed(() => {
         "min-width": 200,
       },
     },
-    {
-      attrs: {
-        label: "关联附件",
-        slot: "file",
-        width: 80,
-        align: "left",
-      },
-    },
+    // {
+    //   attrs: {
+    //     label: "关联附件",
+    //     slot: "file",
+    //     width: 80,
+    //     align: "left",
+    //   },
+    // },
     {
       attrs: {
         label: "打款状态",
@@ -402,13 +402,13 @@ const formConfig = computed(() => {
       type: "title1",
       title: "请款信息",
     },
-    {
-      type: "input",
-      prop: "businessManagementName",
-      label: "付款账户",
-      disabled: true,
-      itemWidth: 50,
-    },
+    // {
+    //   type: "input",
+    //   prop: "businessManagementName",
+    //   label: "付款账户",
+    //   disabled: true,
+    //   itemWidth: 50,
+    // },
     {
       type: "input",
       prop: "incomeAmount",
@@ -491,6 +491,7 @@ const formConfig = computed(() => {
       precision: 2,
       min: 0,
       controls: false,
+      disabled: true,
       style: {
         width: "100%",
       },
@@ -617,10 +618,10 @@ const paymentType = ref([
     label: "已打款",
     value: 10,
   },
-  {
-    label: "部分打款",
-    value: 15,
-  },
+  // {
+  //   label: "部分打款",
+  //   value: 15,
+  // },
   {
     label: "未打款",
     value: 20,

src/views/finance/fundManage/costControl/index.vue

@@ -15,8 +15,9 @@
         </template>
         <template #accountPaymentStatus="{item}">
           <div style="width: 100%">
-            <span :class="{'el-click':item.accountPaymentStatus <20}"
+            <span v-if="item.accountPaymentStatus <20" class="el-click"
                   @click="getDtl(item)">{{dictValueLabel(item.accountPaymentStatus ,paymentType)}}</span>
+            <span v-else>{{dictValueLabel(item.accountPaymentStatus ,paymentType)}}</span>
           </div>
         </template>
       </byTable>
@@ -115,10 +116,10 @@ const paymentType = ref([
     label: "已打款",
     value: 10,
   },
-  {
-    label: "部分打款",
-    value: 15,
-  },
+  // {
+  //   label: "部分打款",
+  //   value: 15,
+  // },
   {
     label: "未打款",
     value: 20,
@@ -400,13 +401,13 @@ const formConfig = computed(() => {
       type: "title1",
       title: "请款信息",
     },
-    {
-      type: "input",
-      prop: "businessManagementName",
-      label: "付款账户",
-      disabled: true,
-      itemWidth: 50,
-    },
+    // {
+    //   type: "input",
+    //   prop: "businessManagementName",
+    //   label: "付款账户",
+    //   disabled: true,
+    //   itemWidth: 50,
+    // },
     {
       type: "input",
       prop: "incomeAmount",