删除生产科邮件配置页面

boyang
1 parent 643471d9
Showing 8 changed files with 186 additions and 259 deletions
src/api/sys/config.ts
src/views/project/config/DrawerEdit.vue
src/views/project/config/ProductPanel.vue
src/views/project/config/index.vue
src/views/project/order/ProductText.vue
src/views/project/order/index.vue
src/views/project/order/tableData.tsx
vite.config.ts
@@ -86,17 +86,18 @@ export function deleteConfig(params: LoginParams) {
 // };
 export const getEmailList = async (params: any) => {
-  console.log(params, 111222);
   const res = await defHttp.post<any>({
     url: Api.EMAIL_LIST,
     params,
   });
+  console.log(res, 111222);
   const resAll = dealRecords(res.records);
-  console.log(resAll);
+  console.log(resAll, 111222);
   return resAll;
 };
 function dealRecords(data: any) {
+  console.log(data, 111222);
   for (const value of data) {
     const emailEvents = JSON.parse(value.configInfos);
     value.configInfos = emailEvents;
@@ -41,6 +41,7 @@
         span: 23,
       },
       defaultValue: '',
+      rules: [{ required: true }],
     },
     {
       field: 'configSample',
-<template>
-  <BasicTable @register="registerTable">
-    <template #toolbar>
-      <a-button type="primary" @click="handleCreateModal">新建</a-button>
-    </template>
-    <template #bodyCell="{ column, record }">
-      <template v-if="column.key === 'action'">
-        <TableAction :actions="createActions(record)" />
-      </template>
-    </template>
-  </BasicTable>
-  <CreateModal @register="createModalRegister" @modal-success="handleModalSuccess" />
-</template>
-<script setup lang="ts">
-  import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import CreateModal from './CreateModal.vue';
-  import { deleteConfig, getList, saveConfig } from '/@/api/sys/config';
-  import { columnsProduct } from './data';
-  import { useModal } from '/@/components/Modal';
-
-  const [createModalRegister, { openModal }] = useModal();
-
-  const [registerTable, { reload }] = useTable({
-    api: getList,
-    pagination: false,
-    columns: columnsProduct,
-    rowKey: 'id',
-    actionColumn: {
-      width: 160,
-      title: 'Action',
-      dataIndex: 'action',
-    },
-  });
-
-  function handleCreateModal() {
-    openModal(true);
-  }
-
-  function createActions(record: any): any[] {
-    if (!record.editable) {
-      return [
-        {
-          label: '编辑',
-          onClick: handleEdit.bind(null, record),
-        },
-        {
-          ...{
-            label: '删除',
-            // onClick: handleDelete.bind(null, record),
-            popConfirm: {
-              title: '确认删除？',
-              confirm: handleDelete.bind(null, record),
-            },
-          },
-        },
-      ];
-    }
-    return [
-      {
-        label: '保存',
-        onClick: handleSave.bind(null, record),
-      },
-      {
-        label: '取消',
-        popConfirm: {
-          title: '是否取消编辑',
-          confirm: handleCancel.bind(null, record),
-        },
-      },
-    ];
-  }
-
-  async function handleSave(record) {
-    await saveConfig({ id: record.id, relationValue: record.relationValue });
-    handleCancel(record);
-    reload();
-  }
-
-  function handleEdit(record: any) {
-    record.onEdit?.(true);
-  }
-
-  function handleCancel(record) {
-    record.onEdit?.(false, false);
-  }
-
-  function handleModalSuccess() {
-    reload();
-  }
-
-  async function handleDelete(record) {
-    await deleteConfig({ ids: [record.id] });
-    reload();
-  }
-</script>
-<style></style>
@@ -12,7 +12,6 @@
           <TablePanel :searchInfo="{ settingCode: 'exchangeRate' }" :column="3"
         /></Tabs.TabPane>
         <Tabs.TabPane key="4" tab="邮件发送配置"><EmailPanel /></Tabs.TabPane>
-        <Tabs.TabPane key="5" tab="生产科邮件配置"><ProductPanel /></Tabs.TabPane>
       </Tabs>
     </div>
   </PageWrapper>
@@ -3,183 +3,155 @@
     v-bind="$attrs"
     destroyOnClose
     @register="register"
-    title="导出"
+    title="生产指标书"
     width="500px"
-    :height="100"
-    wrapClassName="h-[260px]"
+    :height="80"
+    wrapClassName="h-[340px]"
     @visible-change="handleShow"
     :footer="null"
   >
-    <CheckboxGroup v-model:value="checkedList" :options="options" />
-    <div className="mt-6">
-      <a-button type="primary" @click="handleExport" className="ml-4" :loading="exportLoading"
-        >导出</a-button
-      >
+    <div class="container">
+      <div v-if="isShow1 == true" style="margin-top: 50px; text-align: center">
+        <RadioGroup v-model:value="choose" :options="options" />
+      </div>
+      <div class="showPdf" v-if="isShow2 == true" style="margin-top: 35px; text-align: center">
+        <!-- <img src="/pdf.png" /> -->
+        <FilePptOutlined :style="{ fontSize: '20px' }" class="FilePptOutlined" />
+        <div style="margin-top: 1px; margin-left: 10px">生产指标书</div>
+        <EyeOutlined :style="{ fontSize: '20px' }" class="EyeOutlined" @click="handlePdf" />
+      </div>
+      <div class="bottom">
+        <a-button type="primary" @click="handleProduct" className="ml-4" v-if="isShow1 == true"
+          >生成</a-button
+        >
+        <a-button
+          type="primary"
+          @click="handleExport"
+          className="ml-4"
+          :loading="exportLoading"
+          v-if="isShow1 == false"
+          >发送</a-button
+        >
+        <a-button type="primary" @click="handleCancel" className="ml-4" style="margin-left: 6px"
+          >取消</a-button
+        >
+      </div>
     </div>
   </BasicModal>
 </template>
 <script lang="ts">
   import { defineComponent, ref, computed } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
-  import { orderExport } from '/@/api/project/order';
-  import { ROLE } from './type.d';
-  import { CheckboxGroup } from 'ant-design-vue';
-  import { useOrderStoreWithOut } from '/@/store/modules/order';
-  import { useOrderInfo } from '/@/hooks/component/order';
-  import { merge } from 'lodash-es';
-  import {
-    ORDER_LIST_BASE_FIELDS,
-    ORDER_LIST_REPORT_FIELDS,
-    ORDER_LIST_PROFIT_FIELDS,
-    ORDER_LIST_INSPECT_FIELDS,
-    ORDER_LIST_TRACK_FIELDS,
-  } from './tableData';
+  import { RadioGroup } from 'ant-design-vue';
+  import { EyeOutlined, FilePptOutlined } from '@ant-design/icons-vue';
+  import { createImgPreview } from '@/components/Preview';
   export default defineComponent({
-    components: { BasicModal, CheckboxGroup },
-    props: {
-      role: {
-        type: String,
-      },
-      ids: {
-        type: Array<string | number>,
-      },
-    },
+    components: { BasicModal, RadioGroup, EyeOutlined, FilePptOutlined },
     setup(props) {
-      const orderStore = useOrderStoreWithOut();
-      const { manualPreform, exchangeRate } = useOrderInfo(orderStore);
-      const checkedList = ref([
-        // 'baseFields',
-        // 'reportFields',
-        // 'profitAnalysisFields',
-        // 'trackStageFields',
-        // 'inspectionStageFields',
-      ]);
       const loading = ref(true);
       const exportLoading = ref(false);
-      const activeUser = ref();
       const info = ref();
-      const searchData = ref({});
-      const [register, { setModalProps, closeModal }] = useModalInner(async (data) => {
-        searchData.value = data.data || {};
-        activeUser.value = undefined;
-        info.value = '';
-      });
-
+      const choose = ref(); //选择公司
+      const isShow1 = ref(true); //选择公司页面
+      const isShow2 = ref(false); //生成PDF页面
+      const pdf = ref(['/pdf.png']);
+      const [register, { setModalProps, closeModal }] = useModalInner();
       const options = computed(() => {
         // 运营总监-基本信息，跟单，质检
-        if (props.role === ROLE.DATA_REPORT_USER) {
-          return [
-            { label: '基本信息', value: 'baseFields' },
-            { label: '跟单信息', value: 'trackStageFields' },
-            { label: '质检信息', value: 'inspectionStageFields' },
-          ];
-        }
-        if (props.role === ROLE.BUSINESS) {
-          return [
-            { label: '基本信息', value: 'baseFields' },
-            { label: '项目报告', value: 'reportFields' },
-            { label: '利润分析', value: 'profitAnalysisFields' },
-            { label: '跟单信息', value: 'trackStageFields' },
-            { label: '质检信息', value: 'inspectionStageFields' },
-          ];
-        }
-        if (props.role === ROLE.TRACKER) {
-          return [
-            { label: '基本信息', value: 'baseFields' },
-            { label: '利润分析', value: 'profitAnalysisFields' },
-            { label: '跟单信息', value: 'trackStageFields' },
-            { label: '质检信息', value: 'inspectionStageFields' },
-          ];
-        }
-
-        if (props.role === ROLE.ADMIN) {
-          return [
-            { label: '基本信息', value: 'baseFields' },
-            { label: '项目报告', value: 'reportFields' },
-            { label: '利润分析', value: 'profitAnalysisFields' },
-            { label: '跟单信息', value: 'trackStageFields' },
-            { label: '质检信息', value: 'inspectionStageFields' },
-          ];
-        }
-
-        // 质检不能导出任何
-        return [{ label: '质检信息', value: 'inspectionStageFields' }];
+        return [
+          { label: '青岛翱特逸格饰品有限公司', value: '1' },
+          { label: ' 青岛吉庆天成饰品有限公司', value: '2' },
+        ];
       });
-
+      function handleCancel() {
+        loading.value = true;
+        choose.value = '';
+        setModalProps({ loading: false, confirmLoading: false });
+        isShow1.value = true;
+        isShow2.value = false;
+        closeModal();
+      }
       function handleShow(visible: boolean) {
         if (visible) {
           loading.value = true;
+          choose.value = '';
           setModalProps({ loading: false, confirmLoading: false });
+          isShow1.value = true;
+          isShow2.value = false;
         }
       }
-
+      function handleProduct() {
+        if (choose.value == '1' || choose.value == '2') {
+          isShow1.value = false;
+          isShow2.value = true;
+        }
+        //此处设置接口传递选择的公司值
+      }
+      function handlePdf() {
+        // 可以使用createImgPreview返回的 PreviewActions 来控制预览逻辑，实现类似幻灯片、自动旋转之类的骚操作
+        // createImgPreview({
+        //   imageList: pdf.value,
+        //   defaultWidth: 500,
+        //   rememberState: true,
+        //   maskClosable: true,
+        // });
+        console.log(123);
+      }
       async function handleExport() {
-        const fieldVO: any = {};
-        checkedList.value.forEach((item) => {
-          if (item === 'baseFields') {
-            fieldVO.baseFields = ORDER_LIST_BASE_FIELDS.map((item) => ({
-              [item.dataIndex]: 'selected',
-            }));
-            fieldVO.baseFields = merge({}, ...fieldVO.baseFields);
-          } else if (item === 'reportFields') {
-            fieldVO.reportFields = ORDER_LIST_REPORT_FIELDS[0].children.map((item) => ({
-              [item.dataIndex]: 'selected',
-            }));
-            fieldVO.reportFields = merge({}, ...fieldVO.reportFields);
-          } else if (item === 'profitAnalysisFields') {
-            if (props.role === ROLE.TRACKER) {
-              fieldVO.profitAnalysisFields = ORDER_LIST_PROFIT_FIELDS[0].children
-                .filter((k) =>
-                  [
-                    'customerPrice',
-                    'productionDepartmentPrice',
-                    'productionDepartmentTotalPrice',
-                  ].includes(k.dataIndex),
-                )
-                .map((item) => ({
-                  [item.dataIndex]: 'selected',
-                }));
-            } else {
-              fieldVO.profitAnalysisFields = ORDER_LIST_PROFIT_FIELDS[0].children.map((item) => ({
-                [item.dataIndex]: 'selected',
-              }));
-            }
-            fieldVO.profitAnalysisFields = merge({}, ...fieldVO.profitAnalysisFields);
-          } else if (item === 'trackStageFields') {
-            fieldVO.trackStageFields = ORDER_LIST_TRACK_FIELDS[0].children.map((item) => ({
-              [item.dataIndex]: 'selected',
-            }));
-            fieldVO.trackStageFields = merge({}, ...fieldVO.trackStageFields);
-          } else if (item === 'inspectionStageFields') {
-            fieldVO.inspectionStageFields = ORDER_LIST_INSPECT_FIELDS[0].children.map((item) => ({
-              [item.dataIndex]: 'selected',
-            }));
-            fieldVO.inspectionStageFields = merge({}, ...fieldVO.inspectionStageFields);
-          }
-        });
-
-        //导出选中的订单
-        fieldVO.orderIds = props.ids;
-        exportLoading.value = true;
-        await orderExport({ ...searchData.value, fieldVO });
-        exportLoading.value = false;
-
         closeModal();
       }
       return {
         register,
-        options,
         loading,
+        choose,
         handleShow,
+        handleCancel,
         info,
-        manualPreform,
         handleExport,
-        activeUser,
-        exchangeRate,
-        checkedList,
+        handleProduct,
+        handlePdf,
         exportLoading,
+        isShow1,
+        isShow2,
+        options,
+        pdf,
       };
     },
   });
 </script>
+<style scoped>
+  /* .container {
+    position: relative;
+  }
+  .bottom {
+    position: absolute;
+    bottom: 0;
+  } */
+  .container {
+    display: flex;
+    flex-direction: column;
+    min-height: 20vh;
+  }
+  .bottom {
+    margin-top: auto;
+    margin-left: auto;
+    margin-right: 20px;
+  }
+  .showPdf {
+    border: 2px solid;
+    border-color: #d8d8d8;
+    border-radius: 5px;
+    height: 30px;
+    position: relative;
+    display: flex;
+  }
+  .FilePptOutlined {
+    margin-top: 3px;
+    margin-left: 30px;
+  }
+  .EyeOutlined {
+    margin-top: 3px;
+    margin-left: 290px;
+  }
+</style>
@@ -63,6 +63,10 @@
                       onClick: handleHistory.bind(null, record),
                     },
                     {
+                      label: '跟单结果记录',
+                      onClick: handleInvoice.bind(null, record),
+                    },
+                    {
                       // 数据分析没有编辑权限
                       ...((role === ROLE.ADMIN || role === ROLE.TRACKER) && {
                         label: '复制',
@@ -294,6 +298,10 @@
         return false;
       }
+      function handleInvoice() {
+        console.log(1);
+      }
+
       function handleProfitModal() {
         const form = getForm();
         const values = form.getFieldsValue();
@@ -388,6 +396,7 @@
         checkModalRegister,
         handleGoCheckDetail,
         handleGoFormDetail,
+        handleInvoice,
         handleHistory,
         handleAdd,
         createImgPreview,
@@ -99,7 +99,7 @@ export const ORDER_LIST_BASE_FIELDS = [
     dataIndex: 'picUrl',
   },
   {
-    title: '生产要求',
+    title: '产品意见',
     width: 150,
     dataIndex: 'productionComment',
   },
@@ -345,8 +345,8 @@ export const ORDER_LIST_PROFIT_FIELDS = [
           return record?.profitAnalysisInfo?.profitType === '0'
             ? '方式1'
             : record?.profitAnalysisInfo?.profitType === '1'
-            ? '方式2'
-            : '';
+              ? '方式2'
+              : '';
         },
       },
     ],
@@ -787,7 +787,7 @@ export const FIELDS_BASE_INFO = [
     component: 'Input',
     rules: [{ required: true }],
     labelWidth: 150,
-    label: '生产要求',
+    label: '产品意见',
   },
   {
     field: 'orderCount',
@@ -916,15 +916,36 @@ export const FIELDS_TRACK_STAGE_INFO = [
   },
   {
     field: 'ppConfirmResult',
-    component: 'Input',
-    // componentProps: {
-    //   options: [
-    //     {
-    //       label: 'ok',
-    //       value: 'ok',
-    //     },
-    //   ],
-    // },
+    component: 'Select',
+    componentProps: {
+      options: [
+        {
+          label: '1+1st+ok',
+          value: '1+1st+ok',
+        },
+        {
+          label: '1+1st+Fail',
+          value: '1+1st+Fail',
+        },
+        {
+          label: '1+1st+ok',
+          value: '1+1st+ok',
+        },
+        {
+          label: '2+2st+Fail',
+          value: '2+2st+Fail',
+        },
+        {
+          label: '3+3st+ok',
+          value: '3+3st+ok',
+        },
+        {
+          label: '3+3st+Fail',
+          value: '3+3st+Fail',
+        },
+      ],
+    },
+    default: '请选择',
     label: 'pp样品确认意见	',
   },
   {
@@ -1529,8 +1550,28 @@ export function getFormConfig(businessUsers: any[]): Partial&lt;FormProps&gt; {
           mode: 'multiple',
           options: [
             {
-              label: 'ok',
-              value: 'ok',
+              label: '1+1st+ok',
+              value: '1+1st+ok',
+            },
+            {
+              label: '1+1st+Fail',
+              value: '1+1st+Fail',
+            },
+            {
+              label: '1+1st+ok',
+              value: '1+1st+ok',
+            },
+            {
+              label: '2+2st+Fail',
+              value: '2+2st+Fail',
+            },
+            {
+              label: '3+3st+ok',
+              value: '3+3st+ok',
+            },
+            {
+              label: '3+3st+Fail',
+              value: '3+3st+Fail',
             },
           ],
         },
@@ -20,8 +20,8 @@ export default defineApplicationConfig({
     server: {
       proxy: {
         '/basic-api/order': {
-          // target: 'http://39.108.227.113:8000',
-          target: 'http://localhost:8000',
+          target: 'http://47.104.8.35:18000',
+          // target: 'http://localhost:8000',
           // target: 'http://39.108.227.113:3000/mock/35',
           // http://39.108.227.113:8000/order/erp/captcha/get_img_captcha_code
           changeOrigin: true,
@@ -29,8 +29,8 @@ export default defineApplicationConfig({
           rewrite: (path) => path.replace(new RegExp(`^/basic-api`), ''),
         },
         '/api/localStorage/upload': {
-          // target: 'http://39.108.227.113:8000',
-          target: 'http://localhost:8000',
+          target: 'http://47.104.8.35:18000',
+          // target: 'http://localhost:8000',
           changeOrigin: true,
           ws: true,
           // rewrite: (path) => {