feat: 一期功能收尾

sanmu
1 parent 48302ce4
Showing 8 changed files with 173 additions and 43 deletions
src/api/project/order.ts
src/utils/http/axios/Axios.ts
src/utils/project.ts
src/views/project/order/FormDetail/BaseFormPanel.vue
src/views/project/order/FormDetail/InspectionFormPanel.vue
src/views/project/order/FormDetail/index.vue
src/views/project/order/index.vue
src/views/project/order/tableData.tsx
@@ -29,6 +29,7 @@ enum Api {
   OPT_LOG = '/order/erp/opt/log/list_by_page', // 操作日志
   AUDIT_LOG = '/order/erp/audit/log/list_by_page', //审批日志
   ORDER_RATE_EXPORT = '/order/erp/report/export', // 所有设计师比重导出
+  ORDER_FIELD_CHECK = '/order/erp/order/check', // 校验内部编号是否重复
 }
  
 export const formatSearchData = (params) => {
@@ -83,6 +84,15 @@ export const getOrderOptLog = async (data: any) =&gt; {
 export const getOrderAuditLog = async (data: any) => {
   return defHttp.post<any>({ url: Api.AUDIT_LOG, data });
 };
+export const orderFieldCheck = async (data: any) => {
+  try {
+    await defHttp.post<any>({ url: Api.ORDER_FIELD_CHECK, data });
+  } catch (error) {
+    // 重复
+    return error.result === 1000;
+  }
+  return false;
+};
  
 export const orderUpdate = async (data: any) => {
   const res = await defHttp.post<any>({ url: Api.UPDATE, data }, { message: '操作成功' });
@@ -234,7 +234,7 @@ export class VAxios {
             return router.push('/login');
           }
           if (res.data.result !== 0 && res.data.message) {
-            createMessage.error(res.data.message);
+            if (res.data.message !== '款式重复，是否继续') createMessage.error(res.data.message);
             return reject(res.data);
           }
  
@@ -28,3 +28,30 @@ export const getBaseDisable = (field, code, id) =&gt; {
   }
   return false;
 };
+
+// 质量检测的disable函数
+// 中期验货：只要是PASS, PASS 2ND, PASS 3RD, FAIL-RELEASE，就锁定。
+// 终期验货：只要是PASS, PASS 2ND, PASS 3RD, FAIL-RELEASE，就锁定。
+export const getQualityDisable = (field, code, id, value, endValue) => {
+  // 确认自己是否是锁住的
+  // const isLock = getDisable(code, id, value);
+  const isLock = code === 'LOCKED' && !!id;
+  // 如果不是锁的，直接返回不锁
+  if (!isLock) return false;
+
+  // 锁的话，需要在进行下面判断，确定要不要不锁
+  if (isLock) {
+    // 所有字段就锁定判断，终期验货结果，值是PASS, PASS 2ND, PASS 3RD, FAIL-RELEASE就锁定。
+    const isEndLock = ['PASS', 'PASS 2ND', 'PASS 3RD', 'FAIL RELEASE'].includes(endValue);
+    if (isEndLock) {
+      // return isEndLock && !!id && (value || value === 0);
+      return isEndLock;
+    } else {
+      // 中期验货结果，值是PASS, PASS 2ND, PASS 3RD, FAIL-RELEASE，就锁定。
+      if (field === 'midCheckResult') {
+        return ['PASS', 'PASS 2ND', 'PASS 3RD', 'FAIL RELEASE'].includes(value);
+      }
+    }
+  }
+  return false;
+};
 <template>
-  <BasicForm @register="registerForm" />
+  <div className="pb-2">
+    <BasicForm @register="registerForm" />
+  </div>
+  <div
+    v-if="isInnerNoRepeat"
+    class="absolute bottom-0 left-0 bg-gray-200 px-2 py-1 w-full text-orange-500"
+    >{{ isInnerNoRepeat }}</div
+  >
 </template>
 <script lang="ts">
-  import { computed, defineComponent, ref } from 'vue';
+  import { computed, defineComponent, onMounted, ref, watch } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { FIELDS_BASE_INFO } from '../tableData';
   import { getBaseDisable } from '/@/utils/project';
@@ -10,6 +17,7 @@
  
   import { useOrderInfo } from '/@/hooks/component/order';
   import { get } from 'lodash-es';
+  import { orderFieldCheck } from '/@/api/project/order';
  
   export default defineComponent({
     components: { BasicForm },
@@ -24,12 +32,26 @@
       id: {
         type: String,
       },
+      isCopy: {
+        type: Boolean,
+      },
       businessUsers: {
         type: Array,
       },
     },
     emits: ['success'],
     setup(props) {
+      // 子组建获取isCopy，并且自己维护isCopy的状态
+      let isCopy = ref(props.isCopy);
+      const isInnerNoRepeat = ref('');
+
+      watch(
+        () => props.isCopy,
+        (value) => {
+          isCopy.value = value;
+        },
+      );
+
       let fields = ref({});
       const picUrl = ref('');
       const smallPicUrl = ref('');
@@ -97,12 +119,25 @@
               ...(item.component === 'Select' && { showSearch: true }),
               ...(item.component === 'Select' && { options: options[item.field] }),
               disabled: getBaseDisable(item.field, get(fields.value, `${item.field}`), props.id),
-              onChange: (val) => {
-                if (item.field === 'customerCode') {
+              onChange: async (val) => {
+                if (item.field === 'customerCode' && !isCopy.value) {
                   if (!props.id) {
                     setFieldsValue({ projectNo: val + '-', innerNo: val + '/' });
                   }
                 }
+                isCopy.value = false;
+
+                if (item.field === 'innerNo') {
+                  val = typeof val === 'string' ? val : val.target.value;
+                  const res = await orderFieldCheck({
+                    innerNo: [val],
+                  });
+                  if (res) {
+                    isInnerNoRepeat.value = `内部编码 ${val} 已存在，保存前请确认是否需要修改`;
+                  } else {
+                    isInnerNoRepeat.value = '';
+                  }
+                }
               },
             },
             colProps: {
@@ -133,6 +168,7 @@
         validate,
         picUrl,
         smallPicUrl,
+        isInnerNoRepeat,
       };
     },
   });
@@ -5,7 +5,7 @@
   import { computed, defineComponent, ref } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { FIELDS_INSPECTION_INFO } from '../tableData';
-  import { getDisable } from '/@/utils/project';
+  import { getDisable, getQualityDisable } from '/@/utils/project';
   import { useOrderStoreWithOut } from '/@/store/modules/order';
   import { get } from 'lodash-es';
   import { useOrderInfo } from '/@/hooks/component/order';
@@ -39,10 +39,12 @@
             componentProps: {
               ...(item.component === 'Select' && { showSearch: true }),
               ...(item.component === 'Select' && { options: options[item.field] }),
-              disabled: getDisable(
+              disabled: getQualityDisable(
+                item.field,
                 get(fields.value, item.field),
                 props.id,
                 get(props.inspectFormData, `${item.field}`),
+                get(props.inspectFormData, 'endCheckResult'),
               ),
             },
             colProps: {
@@ -23,7 +23,12 @@
           v-if="role === ROLE.ADMIN || role === ROLE.TRACKER"
         >
           <span className="text-red-600">{{ checkingMsg }}</span>
-          <BaseFormPanel ref="baseFormPanelRef" :id="id" :businessUsers="businessUsers" />
+          <BaseFormPanel
+            ref="baseFormPanelRef"
+            :is-copy="isCopy"
+            :id="id"
+            :businessUsers="businessUsers"
+          />
         </TabPanel>
         <TabPanel
           key="2"
@@ -147,6 +152,7 @@
  
       const formRef = ref<FormActionType | null>(null);
       const id = ref('');
+      const isCopy = ref(false);
       const configList = ref([]);
       const businessUsers = ref([]);
       const checkingMsg = ref('');
@@ -193,10 +199,13 @@
           reportFormPanelRef?.value?.resetFields();
           trackFormPanelRef?.value?.resetFields();
           inspectionFormPanelRef?.value?.resetFields();
-
-          return;
+          // id不存在，而且不是复制的，就是新建，不用走后面逻辑
+          if (!data?.isCopy) return;
         }
+
         id.value = data.id;
+        isCopy.value = data?.isCopy;
+
         profitFormData.value =
           data?.orderUpdateInfoVO?.profitAnalysisFields || data.profitAnalysisInfo;
         inspectFormData.value = data.inspectionStageInfo;
@@ -215,7 +224,7 @@
           ...data.lockFields.baseFields,
         };
  
-        if (id.value) {
+        if (id.value || data?.isCopy) {
           orderCount.value = data.orderCount;
  
           setTimeout(() => {
@@ -228,7 +237,8 @@
               baseFormPanelRef.value.picUrl = data.picUrl;
               baseFormPanelRef.value.smallPicUrl = data.smallPicUrl;
             }
-
+            // 复制，只能更新基本信息
+            if (data.isCopy) return;
             if (profitFormPanelRef.value) {
               // 包装费用通过客户编码去查
               const packetPrice = find(configList.value, (item) => {
@@ -417,6 +427,7 @@
       };
       return {
         id,
+        isCopy,
         profitFormPanelRef,
         reportFormPanelRef,
         trackFormPanelRef,
@@ -41,17 +41,30 @@
                 }),
               },
               {
+                // 数据分析没有编辑权限
                 ...(role !== ROLE.DATA_REPORT_USER && {
-                  label: '申请权限',
+                  label: '复制',
                   // icon: 'ic:outline-delete-outline',
-                  onClick: handleCheck.bind(null, record),
+                  onClick: handleCopy.bind(null, record),
                 }),
               },
+              // {
+              //   ...(role !== ROLE.DATA_REPORT_USER && {
+              //     label: '申请',
+              //     // icon: 'ic:outline-delete-outline',
+              //     onClick: handleCheck.bind(null, record),
+              //   }),
+              // },
             ]"
             :dropDownActions="
               role !== ROLE.DATA_REPORT_USER
                 ? [
                     {
+                      label: '申请权限',
+                      // icon: 'ic:outline-delete-outline',
+                      onClick: handleCheck.bind(null, record),
+                    },
+                    {
                       label: '历史记录',
                       onClick: handleHistory.bind(null, record),
                     },
@@ -247,6 +260,12 @@
         return false;
       }
  
+      function handleCopy(record, e) {
+        openFormDetailDrawer(true, { ...toRaw(record), id: undefined, isCopy: true });
+        e?.stopPropagation();
+        return false;
+      }
+
       function handleAdd() {
         openFormDetailDrawer(true, {});
       }
@@ -339,6 +358,7 @@
         checkedKeys,
         onSelect,
         handleEdit,
+        handleCopy,
         handleCheck,
         onSelectAll,
         tooltipVisible,
@@ -707,7 +707,19 @@ export const FIELDS_BASE_INFO = [
     component: 'Input',
     labelWidth: 150,
     label: '内部编号',
-    rules: [{ required: true }],
+    rules: [
+      { required: true },
+      {
+        validator: async (rule, value) => {
+          if (value.includes(' ')) {
+            return Promise.reject();
+          }
+          return Promise.resolve();
+        },
+        message: '内容存在空格，请检查',
+        trigger: ['change', 'blur'],
+      },
+    ],
   },
   {
     field: 'customerPo',
@@ -721,7 +733,19 @@ export const FIELDS_BASE_INFO = [
     component: 'Input',
     labelWidth: 150,
     label: '客户STYLE',
-    rules: [{ required: true }],
+    rules: [
+      { required: true },
+      {
+        validator: async (rule, value) => {
+          if (value.includes(' ')) {
+            return Promise.reject();
+          }
+          return Promise.resolve();
+        },
+        message: '内容存在空格，请检查',
+        trigger: ['change', 'blur'],
+      },
+    ],
   },
   {
     field: 'modeleLo',
@@ -892,15 +916,15 @@ export const FIELDS_TRACK_STAGE_INFO = [
   },
   {
     field: 'ppConfirmResult',
-    component: 'Select',
-    componentProps: {
-      options: [
-        {
-          label: 'ok',
-          value: 'ok',
-        },
-      ],
-    },
+    component: 'Input',
+    // componentProps: {
+    //   options: [
+    //     {
+    //       label: 'ok',
+    //       value: 'ok',
+    //     },
+    //   ],
+    // },
     label: 'pp样品确认意见	',
   },
   {
@@ -917,15 +941,15 @@ export const FIELDS_TRACK_STAGE_INFO = [
   },
   {
     field: 'shippmentSampleConfirmResult',
-    component: 'Select',
-    componentProps: {
-      options: [
-        {
-          label: 'ok',
-          value: 'ok',
-        },
-      ],
-    },
+    component: 'Input',
+    // componentProps: {
+    //   options: [
+    //     {
+    //       label: 'ok',
+    //       value: 'ok',
+    //     },
+    //   ],
+    // },
     label: 'shipment sample确认意见',
     labelWidth: 250,
   },
@@ -959,16 +983,16 @@ export const FIELDS_TRACK_STAGE_INFO = [
   },
   {
     field: 'sgsTestFinishResult',
-    component: 'Select',
+    component: 'Input',
     label: 'SGS测试结果',
-    componentProps: {
-      options: [
-        {
-          label: 'ok',
-          value: 'ok',
-        },
-      ],
-    },
+    // componentProps: {
+    //   options: [
+    //     {
+    //       label: 'ok',
+    //       value: 'ok',
+    //     },
+    //   ],
+    // },
   },
   {
     field: 'barcodeStickerArrivalTime',