Browse Source

小修改

hbchen-home 2 years ago
parent
commit
d34be300d6

+ 7 - 3
src/views/financialManagement/contractProgress.vue

@@ -25,7 +25,7 @@
   const contractStatusArray=[{id:1,label:"已审批"},{id:2,label:"单章寄出"},{id:3,label:"已签回"},{id:4,label:"已终止"},{id:5,label:"邮件备案"}]
   const contractTypeArray=[{id:1,label:"新签合同"},{id:2,label:"续约合同"},{id:3,label:"代付合同"},{id:4,label:"补充协议"}]
   const operationType=[{op_type:1,label:"合规登记"},{op_type:2,label:"开票登记"},{op_type:3,label:"到款登记"},
-  {op_type:4,label:"修改合同状态"},{op_type:5,label:"删除合同登记"},{op_type:6,label:"合规编辑",op_type:7,label:"预到款登记"}]
+  {op_type:4,label:"修改合同状态"},{op_type:5,label:"删除合同登记"},{op_type:6,label:"合规编辑"},{op_type:7,label:"预到款登记"}]
 
   // 合同信息
   const contractInfo=reactive({
@@ -878,7 +878,11 @@
                 chart_permission_id:serviceItem.chart_permission_id,
                 title:serviceItem.title
               })
-            }else{
+            }
+            else if(serviceId==3){
+              contractInfo.form.services.push(serviceItem)
+            }
+            else{
               contractInfo.form.services.push({service_template_id:serviceItem.service_template_id,title:serviceItem.title})
             }
           })
@@ -1911,7 +1915,7 @@
                                 <el-option label="权益套餐" :value="2"></el-option>
                               </el-select>
                             </el-form-item>
-                            <span v-else>{{ row.service_product_id || '--' }}</span>
+                            <span v-else>{{ row.service_product_id?row.service_product_id==1?'FICC套餐':'权益套餐' : '--' }}</span>
                           </template>
                         </el-table-column>
                         <el-table-column label="到款金额" width="160" align="center" prop="origin_amount">

+ 5 - 1
src/views/financialManagement/invoice/invoiceList.vue

@@ -83,7 +83,11 @@ invoice.placementList()
         <!-- 表格 -->
         <el-table :data="data.tableData" border max-height="560px" size="default" style="position: sticky;"> 
           <el-table-column label="合同编号" align="center" prop="contract_code" show-overflow-tooltip></el-table-column>
-          <el-table-column label="套餐类型" align="center" prop="service_product_id">FICC套餐</el-table-column>
+          <el-table-column label="套餐类型" align="center" prop="service_product_id">
+            <template #default="{row}">
+              {{ invoice.serviceTypeArray[row.service_product_id-1]?.label }}
+            </template>
+          </el-table-column>
           <el-table-column label="开票金额" align="center" prop="origin_amount" show-overflow-tooltip></el-table-column>
           <el-table-column label="金额单位" align="center" prop="unit_name"></el-table-column>
           <el-table-column label="换算金额(元)" align="center" prop="amount" show-overflow-tooltip></el-table-column>