Merge branch 'zwl-develop' into 'develop'

Zwl develop See merge request !15

Merge branch 'zwl-develop' into 'develop'
Zwl develop See merge request !15
张
2 parents 6108c812 1b441296
Showing 14 changed files with 170 additions and 30 deletions
src/views/project/approve/ProduceFieldPanel.vue
src/views/project/config/CreateModal.vue
src/views/project/config/costCreate.vue
src/views/project/config/costEdit.vue
src/views/project/config/data.tsx
src/views/project/finance/financeProfit/ProductProfit/InnerData/data.tsx
src/views/project/finance/financeProfit/ProductProfit/InnerData/tableData.tsx
src/views/project/finance/financeProfit/ProductProfit/InnerProduce/data.tsx
src/views/project/finance/financeProfit/ServiceProfit/PackageProfit/ApproveReason.vue
src/views/project/finance/financeProfit/ServiceProfit/PackageProfit/CheckDetail.vue
src/views/project/finance/financeProfit/ServiceProfit/PackageProfit/FinanceEdit.vue
src/views/project/finance/financeProfit/ServiceProfit/PackageProfit/data.tsx
src/views/project/finance/financeProfit/ServiceProfit/PackageProfit/tableData.tsx
src/views/project/finance/financeProfit/ServiceProfit/ServiceProfit/data.tsx
@@ -40,7 +40,8 @@
   import { approveAuditApi, getApprovedListApi, getWaitListApi } from '/@/api/project/approve';
   import { COLUMNS } from '../finance/financeProfit/ServiceProfit/PackageProfit/data';
   import { getAuditApply, getApplyList } from '/@/api/project/invoice';
-  import { EDIT_INFO } from '../finance/financeProfit/ProductProfit/InnerData/tableData';
+  // import { EDIT_INFO } from '../finance/financeProfit/ProductProfit/InnerData/tableData';
+  import { APPLY_INFO } from '../finance/financeProfit/ProductProfit/InnerData/tableData';
   import { find, isEmpty } from 'lodash-es';
   import { ROLE } from '../order//type.d';
   import { useUserStoreWithOut } from '/@/store/modules/user';
@@ -159,7 +160,7 @@
         !isEmpty(data.fieldInfos.costInfolockFieldVO) &&
           Object.entries(data.fieldInfos.costInfolockFieldVO)?.map(([key, value]) => {
             if (value === 'UN_LOCKED') {
-              const obj = find(EDIT_INFO, { field: key });
+              const obj = find(APPLY_INFO, { field: key });
               fieldInfos.value.baseFields.push(obj?.label);
             }
           });
@@ -108,15 +108,18 @@
               span: 24,
             },
           },
-          {
-            field: 'relationName',
-            component: 'Input',
-            label: '客户名称',
-            rules: [{ required: true }],
-            colProps: {
-              span: 24,
-            },
-          },
+          // 只在客户公司页面显示“客户名称”
+          ...(props.column === 10
+            ? [{
+                field: 'relationName',
+                component: 'Input',
+                label: '客户名称',
+                rules: [{ required: true }],
+                colProps: {
+                  span: 24,
+                },
+              }]
+            : []),
         ],
         showActionButtonGroup: false,
         actionColOptions: {
@@ -30,6 +30,10 @@
         <a-input v-model:value="spainRatio" />
       </div>
       <div
+        ><span style="margin-right: 8px; width: 80%">包装提成金额</span>
+        <a-input v-model:value="copyCommission" />
+      </div>
+      <div
         ><span style="margin-right: 8px; width: 80%">年份：</span>
         <a-select v-model:value="year" style="width: 100%">
           <a-select-option v-for="y in yearOptions" :key="y" :value="y">{{ y }}</a-select-option>
@@ -70,6 +74,7 @@
       const fixCost = ref();
       const ratio = ref();
       const spainRatio = ref();
+      const copyCommission = ref();
       const price = ref();
       const year = ref(new Date().getFullYear().toString());
       // Generate year options from 2023 to current year
@@ -96,6 +101,11 @@
           relationName: '西班牙提成比例',
           relationValue: '',
         },
+        {
+          relationCode: 'copyCommission',
+          relationName: '包装提成金额',
+          relationValue: '',
+        },
         // {
         //   relationCode: 'price',
         //   relationName: '生产提成单价',
@@ -104,10 +114,22 @@
       ]);
       const { customerCode: customerCodeOptions } = useOrderInfo(orderStore);
-      function handleShow(visible: boolean) {
+      function handleShow(visible) {
         if (visible) {
+          // 重置表单字段
+          fixCost.value = '';
+          ratio.value = '';
+          spainRatio.value = '';
+          copyCommission.value = '';
+          customerCode.value = undefined;
+          year.value = new Date().getFullYear().toString();
+          relationValue.value = [
+            { relationCode: 'fixCost', relationName: '固定成本', relationValue: '' },
+            { relationCode: 'ratio', relationName: '提成比例', relationValue: '' },
+            { relationCode: 'spainRatio', relationName: '西班牙提成比例', relationValue: '' },
+            { relationCode: 'copyCommission', relationName: '包装提成金额', relationValue: '' },
+          ];
           loading.value = true;
-          // setModalProps({ loading: true, confirmLoading: true });
           setModalProps({ loading: false, confirmLoading: false });
         }
       }
@@ -129,6 +151,7 @@
           relationValue.value[0].relationValue = fixCost.value;
           relationValue.value[1].relationValue = formatPercentage(ratio.value);
           relationValue.value[2].relationValue = formatPercentage(spainRatio.value);
+          relationValue.value[3].relationValue = copyCommission.value;
           await addConfig({
             settingCode: 'customerCode',
             settingName: '客户提成成本配置',
@@ -153,6 +176,7 @@
         fixCost,
         ratio,
         spainRatio,
+        copyCommission,
         price,
         customerCode,
         year,
@@ -18,6 +18,7 @@
       <a-input v-model:value="fixCost" addonBefore="固定成本  " />
       <a-input v-model:value="ratio" addonBefore="提成比例  " />
       <a-input v-model:value="spainRatio" addonBefore="西班牙提成比例  " />
+      <a-input v-model:value="copyCommission" addonBefore="包装提成金额  " />
       <a-input v-model:value="year" :disabled="true" addonBefore="年份  " />
       <!-- <a-input v-model:value="price" addonBefore="生产提成单价" /> -->
     </a-space>
@@ -41,6 +42,7 @@
     spainRatio.value = relationValue.value[2].relationValue 
       ? (parseFloat(relationValue.value[2].relationValue) * 100).toFixed(2) + '%' 
       : '';
+    copyCommission.value = relationValue.value[3].relationValue;
     year.value = listAll.value.relationName;
   });
   //获取现有的列表
@@ -48,6 +50,7 @@
   const fixCost = ref();
   const ratio = ref();
   const spainRatio = ref();
+  const copyCommission = ref('');
   const relationValue = ref();
   const year = ref();
@@ -65,9 +68,16 @@
   //完成编辑
   async function handleSubmit() {
-    relationValue.value[0].relationValue = fixCost.value;
-    relationValue.value[1].relationValue = formatPercentage(ratio.value);
-    relationValue.value[2].relationValue = formatPercentage(spainRatio.value);
+    // relationValue.value[0].relationValue = fixCost.value;
+    // relationValue.value[1].relationValue = formatPercentage(ratio.value);
+    // relationValue.value[2].relationValue = formatPercentage(spainRatio.value);
+    // relationValue.value[3].relationValue = copyCommission.value;
+    relationValue.value = [
+      { relationCode: 'fixCost', relationName: '固定成本', relationValue: fixCost.value },
+      { relationCode: 'ratio', relationName: '提成比例', relationValue: formatPercentage(ratio.value) },
+      { relationCode: 'spainRatio', relationName: '西班牙提成比例', relationValue: formatPercentage(spainRatio.value) },
+      { relationCode: 'commission', relationName: '提成', relationValue: copyCommission.value },
+    ];
     await saveConfig({
       id: listAll.value.id,
       settingCode: 'customerCode',
@@ -98,6 +98,15 @@ export const COLUMNS = {
         return (value[2]?.relationValue * 100).toFixed(2) + '%';
       },
     },
+    {
+      title: '包装提成金额',
+      dataIndex: 'relationValue',
+      width: 150,
+      customRender: (column) => {
+        const value = JSON.parse(column.record.relationValue);
+        return value[3]?value[3].relationValue:'';
+      },
+    },
     // {
     //   title: '生产提成单价',
     //   dataIndex: 'relationValue',
@@ -85,7 +85,10 @@ export const searchFormSchema = [
     colProps: { span: 8 },
     componentProps: {
-      options: [{
+      options: [ {
+        label: '未完成',
+        value: -1,
+      },{
         label: '待审核',
         value: 0,
       }, {
@@ -73,4 +73,40 @@ export const EDIT_INFO = [
     rules: [{ required: true }],
   },
 ];
-
+export const APPLY_INFO = [
+  {
+    field: 'packetActualRmbTotalPrice',
+    component: 'Select',
+    labelWidth: 150,
+    label: '包装费用实际金额￥',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'orderScore',
+    component: 'Select',
+    labelWidth: 150,
+    label: '跟单评分',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'productionDepartmentPredictPrice',
+    component: 'Select',
+    labelWidth: 180,
+    label: '生产科预算金额',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'productionActualPrice',
+    component: 'Select',
+    labelWidth: 150,
+    label: '实际发生费用',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'productionDepartmentPredictUnitPrice',
+    component: 'Select',
+    labelWidth: 150,
+    label: '生产科预算单价',
+    rules: [{ required: true }],
+  },
+];
@@ -89,7 +89,10 @@ export const searchFormSchema = [
     colProps: { span: 8 },
     componentProps: {
-      options: [{
+      options: [ {
+        label: '未完成',
+        value: -1,
+      },{
         label: '待审核',
         value: 0,
       }, {
@@ -31,6 +31,7 @@
     await getPackageApplyEdit({
       orderId: baseFieldValues.value.orderId,
       packetActualRmbTotalPrice: baseFieldValues.value.packetActualRmbTotalPrice,
+      orderScore: baseFieldValues.value.orderScore,
       applyRemark: baseFieldValues.value.applyRemark,
       type: 80,
     });
@@ -38,8 +38,8 @@
   import { useUserStoreWithOut } from '/@/store/modules/user';
   const userStore = useUserStoreWithOut();
-  const getSchema = (fields) =>
-    fields
+  const getSchema = (fields) => {
+    const result = fields
       .map((item) => ({
         field: `${item.field}`,
         dataIndex: `${item.field}`,
@@ -58,6 +58,8 @@
           // item.field !== 'packetPrice' &&
           item.field !== 'exchangeRate' && item.field !== 'profitRate',
       );
+    return result;
+  };
   export default defineComponent({
     components: { BasicDrawer, BasicForm, ApproveReason },
@@ -23,6 +23,14 @@
         auto-size
       />
       <div style="margin: 16px 0"></div>
+      <div style="font-size: 15px">跟单评分</div>
+      <a-input
+        v-model:value="input2"
+        placeholder="请输入"
+        :disabled="status_score === 'LOCKED'"
+        auto-size
+      />
+      <div style="margin: 16px 0"></div>
       <!-- <template #titleToolbar> <a-button type="primary"> 申请编辑权限 </a-button></template> -->
       <template #appendFooter>
@@ -116,16 +124,19 @@
   const update = ref();
   const status = ref();
-
+  const status_score = ref();
   const input1 = ref();
+  const input2 = ref();
   const id = ref();
   const [register, { setDrawerProps, closeDrawer }] = useDrawerInner((data) => {
     // 方式1
     if (data.data.lockFields) {
       status.value = data.data.lockFields?.packetActualRmbTotalPrice;
+      status_score.value = data.data.lockFields?.orderScore;
     }
     id.value = data.data.orderId;
     input1.value = data.data?.packetActualRmbTotalPrice;
+    input2.value = data.data?.orderScore;
     resetFields();
     setDrawerProps({ confirmLoading: false });
     setFieldsValue({
@@ -142,12 +153,20 @@
     //   bgUrl: update.value.data.bgUrl,
     // };
     if (!input1.value) {
-      error('选项不能为空');
-    } else {
-      await getPackageEdit({
-        orderId: id.value,
-        packetActualRmbTotalPrice: input1.value,
-      });
+      error('包装费用实际金额不能为空');
+    } else{
+      if(!input2.value){
+        await getPackageEdit({
+          orderId: id.value,
+          packetActualRmbTotalPrice: input1.value,
+        });
+      }else{
+        await getPackageEdit({
+          orderId: id.value,
+          packetActualRmbTotalPrice: input1.value,
+          orderScore: Number(input2.value),
+        });
+      }
       emit('success');
       closeDrawer();
     }
@@ -85,7 +85,10 @@ export const searchFormSchema = [
     colProps: { span: 8 },
     componentProps: {
-      options: [{
+      options: [ {
+        label: '未完成',
+        value: -1,
+      },{
         label: '待审核',
         value: 0,
       }, {
@@ -209,6 +212,22 @@ export const COLUMNS = [
     },
   },
   {
+    title: '跟单评分',
+    dataIndex: 'orderScore',
+    width: 120,
+    customRender: (column) => {
+      return column.record?.orderScore?.toFixed(2);
+    },
+  },
+  {
+    title: '提成金额',
+    dataIndex: 'copyCommission',
+    width: 120,
+    customRender: (column) => {
+      return column.record?.copyCommission?.toFixed(2);
+    },
+  },
+  {
     title: '状态',
     dataIndex: 'status',
     width: 120,
@@ -27,5 +27,12 @@ export const FIELDS_BASE_INFO = [
     label: '包装费用实际金额￥',
     rules: [{ required: true }],
   },
+  {
+    field: 'orderScore',
+    component: 'Select',
+    labelWidth: 150,
+    label: '跟单评分',
+    rules: [{ required: true }],
+  },
 ];
@@ -81,7 +81,10 @@ export const searchFormSchema = [
     colProps: { span: 8 },
     componentProps: {
-      options: [{
+      options: [ {
+        label: '未完成',
+        value: -1,
+      },{
         label: '待审核',
         value: 0,
       }, {