daiyanrong hai 1 semana
pai
achega
5761a9ba4e

+ 13 - 12
src/views/tipsSetting/invManagerTotalTips/components/demand-modify-modal.vue

@@ -21,7 +21,7 @@ const createInitialData = () => ({
   date: '',
   companyNo: '',
   totalTip1: '',
-  totalTip2: ''
+  cost_tips: ''
 });
 
 const user_list = ref([])
@@ -33,7 +33,7 @@ const rules = {
   date: [{ required: true, message: "请选择数据时间", trigger: "change" }],
   companyNo: [{ required: true, message: "请选择业务公司", trigger: "change" }],
   totalTip1: [{ required: true, message: "请输入营收目标", trigger: "change" }],
-  totalTip2: [{ required: true, message: "请输入毛利目标", trigger: "change" }]
+  cost_tips: [{ required: true, message: "请输入毛利目标", trigger: "change" }]
 };
 
 function onInput(value, prop) {
@@ -48,8 +48,8 @@ function onInput(value, prop) {
 async function onSubmit() {
   try {
     await formRef.value?.validate()
-    const { companyNo, date, totalTip1, totalTip2, id } = formData.value
-    if (Number(totalTip2) > Number(totalTip1)) {
+    const { companyNo, date, totalTip1, cost_tips, id } = formData.value
+    if (Number(cost_tips) > Number(totalTip1)) {
       ElMessage.warning("毛利目标不能功大于应收目标")
       return
     }
@@ -61,7 +61,7 @@ async function onSubmit() {
     const parameter = {
       id,
       inv_tips: totalTip1,
-      cost_tips: '0',
+      cost_tips: cost_tips,
       uid: companyNo,
       month,
       year
@@ -113,12 +113,12 @@ defineExpose({
         companyNo: uid,
         date: `${year}-${String(month).length === 1 ? '0' + month : month}`,
         totalTip1: inv_tips,
-        totalTip2: '0'
+        cost_tips: cost_tips
       }
       // setTimeout(() => formData.value.companyNo = row.companyNo, 500);
     } else {
       type.value = 'create'
-      formData.value = { date: '', companyNo: row.uid, totalTip1: '', totalTip2: '0' }
+      formData.value = { date: '', companyNo: row.uid, totalTip1: '', cost_tips: '0' }
       // setTimeout(() => formData.value.companyNo = row.companyNo, 500);
     }
   }
@@ -136,7 +136,8 @@ defineExpose({
 
       <ElFormItem label="业务经理" prop="companyNo">
         <ElSelect style="width: 100%" v-model="formData.companyNo" placeholder="业务经理" filterable>
-          <ElOption v-for="item in user_list" :label="item.nickname" :value="item.id" :disabled="item.status == '0'" />
+          <ElOption v-for="item in user_list" :label="item.nickname" :value="item.id" :disabled="item.status == '0'"
+            :key="item.id + '11'" />
         </ElSelect>
       </ElFormItem>
 
@@ -146,11 +147,11 @@ defineExpose({
         </ElInput>
       </ElFormItem>
 
-      <!-- <ElFormItem label="毛利指标" prop="totalTip2">
-        <ElInput placeholder="利润指标" v-model="formData.totalTip2" @input="value => onInput(value, 'totalTip2')">
-          <template #append>{{ unit2TenThousand2(formData.totalTip2) }}</template>
+      <ElFormItem label="毛利指标" prop="cost_tips">
+        <ElInput placeholder="利润指标" v-model="formData.cost_tips" @input="value => onInput(value, 'cost_tips')">
+          <template #append>{{ unit2TenThousand2(formData.cost_tips) }}</template>
         </ElInput>
-      </ElFormItem> -->
+      </ElFormItem>
 
       <ElFormItem>
         <div class="w-full flex justify-end">

+ 8 - 8
src/views/tipsSetting/invManagerTotalTips/config/content.config.ts

@@ -53,14 +53,14 @@ const contentConfig = (isTenthsand: boolean): ContentConfig => ({
         return isTenthsand ? unit2TenThousand2(row.inv_tips) : row.inv_tips
       }
     },
-    // {
-    //   prop: "cost_tips",
-    //   label: "利指标",
-    //   width: "100px",
-    //   cellRenderer({ row }) {
-    //     return isTenthsand ? unit2TenThousand2(row.cost_tips) : row.cost_tips
-    //   }
-    // },
+    {
+      prop: "cost_tips",
+      label: "利指标",
+      width: "100px",
+      cellRenderer({ row }) {
+        return isTenthsand ? unit2TenThousand2(row.cost_tips) : row.cost_tips
+      }
+    },
     {
       prop: "createTime",
       label: "创建时间",

+ 1 - 0
src/views/tipsSetting/invManagerTotalTips/index.vue

@@ -33,6 +33,7 @@ const hooks: PageHooks = {
 };
 
 function handleUpdate(row) {
+  console.log(row);
   demandModifyModal.value?.onDisplay(row)
 }