Merge branch 'znh' of http://39.108.227.113:8001/zhusen/canrd-erp-front into znh

# Conflicts: # src/pages/Order/index.tsx

Merge branch 'znh' of http://39.108.227.113:8001/zhusen/canrd-erp-front into znh
# Conflicts: # src/pages/Order/index.tsx
曾国涛
2 parents ed8e5348 80bcdb56
Showing 4 changed files with 212 additions and 166 deletions
src/pages/Order/components/DeliverModal.tsx
src/pages/Order/constant.ts
src/pages/Order/index.tsx
src/utils/order.ts
@@ -208,7 +208,6 @@ const DeliverModal = ({
       footer={[
         <Button
           key="back"
-          size="large"
           onClick={() => {
             setVisible(false);
           }}
@@ -218,7 +217,6 @@ const DeliverModal = ({
         <Button
           key="selfDeliver"
           type="primary"
-          size="large"
           onClick={async () => {
             //请求体封装
             let list = data.map((item) => {
@@ -253,7 +251,6 @@ const DeliverModal = ({
         <Button
           key="submit"
           type="primary"
-          size="large"
           onClick={async () => {
             //请求体封装
             let list = data.map((item) => {
@@ -51,20 +51,20 @@ export const INVOCING_STATUS_OPTIONS_OLD = {
 };
 export const PAYEE_OPTIONS = {
-  ZHUGUANG_PUBLIC_ACCOUNT: '烛光公账',
-  EXPERIMENT_PUBLIC_ACCOUNT: '实验公账',
-  NEW_ENERGY_PUBLIC_ACCOUNT: '新能源公账',
-  INNOVATION_PUBLIC_ACCOUNT: '创新公账',
-  JIANTU_PUBLIC_ACCOUNT: '坚途公账',
-  KNOWLEDGE_PUBLIC_ACCOUNT: '知识公账',
-  ZHUGUANG_ACCEPTANCE_DRAFT: '烛光承兑汇票',
+  ZHUGUANG_PUBLIC_ACCOUNT: '广东烛光新能源科技有限公司',
+  EXPERIMENT_PUBLIC_ACCOUNT: '东莞市科路得实验器材科技有限公司',
+  NEW_ENERGY_PUBLIC_ACCOUNT: '东莞市科路得新能源科技有限公司',
+  INNOVATION_PUBLIC_ACCOUNT: '东莞科路得创新科技有限公司',
+  JIANTU_PUBLIC_ACCOUNT: '东莞市坚途新材料科技有限公司',
+  KNOWLEDGE_PUBLIC_ACCOUNT: '东莞市科路得知识产权代理有限公司',
+  // ZHUGUANG_ACCEPTANCE_DRAFT: '烛光承兑汇票',
   LIUPING_ACCOUNT: '刘平账户',
   INNOVATION_ALIPAY: '创新支付宝',
   ZHUGUANG_ALIPAY: '烛光支付宝',
-  ZHUGUANG_WISE_COLLECTION: '烛光慧收款',
-  EXPERIMENT_QR_CODE: '实验二维码',
-  INNOVATION_QR_CODE: '创新二维码',
-  NEW_ENERGY_QR_CODE: '新能源二维码',
+  // ZHUGUANG_WISE_COLLECTION: '烛光慧收款',
+  // EXPERIMENT_QR_CODE: '实验二维码',
+  // INNOVATION_QR_CODE: '创新二维码',
+  // NEW_ENERGY_QR_CODE: '新能源二维码',
 };
 export const PROCURE_ORDER_STATUS = {
@@ -26,8 +26,13 @@ import {
 } from '@/utils';
 import {
   getReceivingCompanyOptions,
+  isAdmin,
   isExaminer,
+  isFinance,
+  isProcure,
+  isSales,
   isSupplier,
+  isWarehousekeeper,
 } from '@/utils/order';
 import { getUserInfo } from '@/utils/user';
 import {
@@ -882,110 +887,6 @@ const OrderPage = () =&gt; {
                 参数：{optRecord.parameters}
               </span>
             </div>
-
-            <Flex title={optRecord.notes}>
-              <div
-                className="max-w-[375px] whitespace-no-wrap overflow-hidden overflow-ellipsis hover:cursor-pointer"
-                onClick={() => {
-                  copyToClipboard(optRecord.notes);
-                  message.info('备注复制成功：' + optRecord.notes);
-                }}
-              >
-                <span className="text-[#8C8C8C]">
-                  备注：
-                  {optRecord.notes === null ? '暂无备注' : optRecord.notes}
-                </span>
-              </div>
-              {!isSupplier() ? (
-                <EditTwoTone
-                  className="pl-1 hover:curcor-pointer"
-                  onClick={() => {
-                    setNotesEditVisible(true);
-                    setSelectedRows([optRecord.id]);
-                    setNotes(optRecord.notes);
-                    setNotesType(1);
-                  }}
-                />
-              ) : (
-                ''
-              )}
-            </Flex>
-
-            {(roleCode === 'procure' ||
-              roleCode === 'warehouseKeeper' ||
-              roleCode === 'admin') &&
-            !isSupplier() ? (
-              <>
-                <Flex title={optRecord.supplierName}>
-                  <div className="max-w-[90%] whitespace-no-wrap overflow-hidden overflow-ellipsis">
-                    <span className="text-[#8C8C8C]">
-                      所属采购：
-                      {optRecord.supplierName === null
-                        ? '暂无'
-                        : optRecord.supplierName}
-                    </span>
-                  </div>
-
-                  <Divider type="vertical" />
-
-                  <div className="max-w-[90%] whitespace-no-wrap overflow-hidden overflow-ellipsis">
-                    <span className="text-[#8C8C8C]">
-                      采购备注：
-                      {optRecord.procureNotes === null
-                        ? '暂无备注'
-                        : optRecord.procureNotes}
-                    </span>
-                  </div>
-                  {/* 编辑备注按钮 */}
-                  <EditTwoTone
-                    className="pl-1 hover:curcor-pointer"
-                    onClick={() => {
-                      setSelectedRows([optRecord.id]);
-                      setNotes(optRecord.procureNotes);
-                      setNotesEditVisible(true);
-                      setNotesType(2);
-                    }}
-                  />
-                </Flex>
-
-                <Flex title={optRecord.supplierNotes}>
-                  <div className="max-w-[90%] whitespace-no-wrap overflow-hidden overflow-ellipsis">
-                    <span className="text-[#8C8C8C]">
-                      供应商备注：
-                      {optRecord.supplierNotes === null
-                        ? '暂无备注'
-                        : optRecord.supplierNotes}
-                    </span>
-                  </div>
-                  {/* 编辑备注按钮 */}
-                  <EditTwoTone
-                    className="pl-1 hover:curcor-pointer"
-                    onClick={() => {
-                      setSelectedRows([optRecord.id]);
-                      setNotes(optRecord.supplierNotes);
-                      setNotesEditVisible(true);
-                      setNotesType(3);
-                    }}
-                  />
-                </Flex>
-              </>
-            ) : (
-              ''
-            )}
-
-            {/* {optRecord.applyInvoicingNotes !== undefined &&
-            optRecord.applyInvoicingNotes !== null ? (
-            <Flex title={optRecord.notes}>
-              <div className="max-w-[90%] whitespace-no-wrap overflow-hidden overflow-ellipsis">
-                <span className="text-[#8C8C8C]">
-                  开票备注：
-                  {optRecord.applyInvoicingNotes}
-                </span>
-              </div>
-            </Flex>
-          ) : (
-            ''
-          )} */}
           </Flex>
           <Flex className="w-[13%]" vertical gap="small">
             {!isSupplier() ? (
@@ -2002,11 +1903,98 @@ const OrderPage = () =&gt; {
           </Flex>
         </Flex>
-        {roleCode === 'admin' ||
-        roleCode === 'salesManager' ||
-        roleCode === 'salesRepresentative' ||
-        roleCode === 'finance' ? (
-          <Flex title={optRecord.notes}>
+        <Flex title={optRecord.notes}>
+          <div
+            className="overflow-hidden whitespace-normal overflow-ellipsis hover:cursor-pointer"
+            onClick={() => {
+              copyToClipboard(optRecord.notes);
+              message.info('备注复制成功：' + optRecord.notes);
+            }}
+          >
+            <span className="text-[#8C8C8C]">
+              备注：
+              {optRecord.notes === null ? '暂无备注' : optRecord.notes}
+            </span>
+          </div>
+          {!isSupplier() && (isSales() || isWarehousekeeper() || isAdmin()) && (
+            <EditTwoTone
+              className="pl-1 pr-1 hover:curcor-pointer"
+              onClick={() => {
+                setNotesEditVisible(true);
+                setSelectedRows([optRecord.id]);
+                setNotes(optRecord.notes);
+                setNotesType(1);
+              }}
+            />
+          )}
+        </Flex>
+
+        {(isProcure() || isWarehousekeeper() || isSales() || isAdmin()) &&
+        !isSupplier() ? (
+          <div className="pt-2">
+            <Flex title={optRecord.supplierName}>
+              <div>
+                <span className="text-[#8C8C8C]">
+                  所属采购：
+                  {optRecord.supplierName === null
+                    ? '暂无'
+                    : optRecord.supplierName}
+                </span>
+              </div>
+
+              <Divider type="vertical" />
+
+              <div className="overflow-hidden whitespace-normal overflow-ellipsis hover:cursor-pointer">
+                <span className="text-[#8C8C8C]">
+                  采购备注：
+                  {optRecord.procureNotes === null
+                    ? '暂无备注'
+                    : optRecord.procureNotes}
+                </span>
+              </div>
+              {/* 编辑备注按钮 */}
+              {(isProcure() || isAdmin()) && (
+                <EditTwoTone
+                  className="pl-1 pr-1 hover:curcor-pointer"
+                  onClick={() => {
+                    setSelectedRows([optRecord.id]);
+                    setNotes(optRecord.procureNotes);
+                    setNotesEditVisible(true);
+                    setNotesType(2);
+                  }}
+                />
+              )}
+            </Flex>
+
+            {(isAdmin() || isProcure()) && (
+              <Flex title={optRecord.supplierNotes}>
+                <div className="max-w-[90%] whitespace-no-wrap overflow-hidden overflow-ellipsis">
+                  <span className="text-[#8C8C8C]">
+                    供应商备注：
+                    {optRecord.supplierNotes === null
+                      ? '暂无备注'
+                      : optRecord.supplierNotes}
+                  </span>
+                </div>
+                {/* 编辑备注按钮 */}
+                <EditTwoTone
+                  className="pl-1 hover:curcor-pointer"
+                  onClick={() => {
+                    setSelectedRows([optRecord.id]);
+                    setNotes(optRecord.supplierNotes);
+                    setNotesEditVisible(true);
+                    setNotesType(3);
+                  }}
+                />
+              </Flex>
+            )}
+          </div>
+        ) : (
+          ''
+        )}
+
+        {isAdmin() || isSales() || isFinance() ? (
+          <Flex title={optRecord.notes} className="pt-2">
             <div className="flex items-center">
               <div className="flex items-center max-w-[500px]">
                 <div className="max-w-md overflow-hidden whitespace-no-wrap overflow-ellipsis">
@@ -2267,22 +2255,19 @@ const OrderPage = () =&gt; {
                       }}
                     >
                       <span className="text-[#8C8C8C]">收货人：</span>
+                      {!isSupplier() && (
+                        <Tooltip className="order-tooltip" title="详情">
+                          <ContainerTwoTone
+                            className="px-1 hover:curcor-pointer"
+                            onClick={() => {
+                              createOptObject(null, record.id);
+                              setDeliverInfoDrawerVisible(true);
+                            }}
+                          />
+                        </Tooltip>
+                      )}
                       <span className="text-slate-700">
                         {record.customerName + ' '}
-
-                        {!isSupplier() ? (
-                          <Tooltip className="order-tooltip" title="详情">
-                            <ContainerTwoTone
-                              className="hover:curcor-pointer"
-                              onClick={() => {
-                                createOptObject(null, record.id);
-                                setDeliverInfoDrawerVisible(true);
-                              }}
-                            />
-                          </Tooltip>
-                        ) : (
-                          ''
-                        )}
                       </span>
                     </span>
                   </div>
@@ -2356,34 +2341,33 @@ const OrderPage = () =&gt; {
               {roleCode === 'finance' ? <Divider type="vertical" /> : ''}
+              <div title={record.notes}>
+                <div
+                  className="max-w-[850px] whitespace-normal overflow-hidden overflow-ellipsis hover:cursor-pointer"
+                  onClick={() => {
+                    copyToClipboard(record.notes);
+                    message.info('备注复制成功：' + record.notes);
+                  }}
+                >
+                  <span className="text-[#8C8C8C]">备注：</span>
+                  <span className="ml-2">
+                    {record.notes === null ? '暂无备注' : record.notes}
+                  </span>
+                </div>
+              </div>
+
               {!isSupplier() ? (
-                <>
-                  <div title={record.notes}>
-                    <div
-                      className="max-w-md overflow-hidden whitespace-no-wrap overflow-ellipsis hover:cursor-pointer"
-                      onClick={() => {
-                        copyToClipboard(record.notes);
-                        message.info('备注复制成功：' + record.notes);
-                      }}
-                    >
-                      <span className="text-[#8C8C8C]">备注：</span>
-                      <span className="ml-2">
-                        {record.notes === null ? '暂无备注' : record.notes}
-                      </span>
-                    </div>
-                  </div>
-                  <Tooltip title="编辑">
-                    <EditTwoTone
-                      className="pl-1 hover:curcor-pointer"
-                      onClick={() => {
-                        setNotesEditVisible(true);
-                        setSelectedRows([record.id]);
-                        setNotes(record.notes);
-                        setNotesType(0);
-                      }}
-                    />
-                  </Tooltip>
-                </>
+                <Tooltip title="编辑">
+                  <EditTwoTone
+                    className="pl-1 hover:curcor-pointer"
+                    onClick={() => {
+                      setNotesEditVisible(true);
+                      setSelectedRows([record.id]);
+                      setNotes(record.notes);
+                      setNotesType(0);
+                    }}
+                  />
+                </Tooltip>
               ) : (
                 ''
               )}
@@ -3666,6 +3650,29 @@ const OrderPage = () =&gt; {
   }
   /**
+   * 排除采购
+   */
+  if ((roleCode === 'procure' || roleCode === 'admin') && !isSupplier()) {
+    mainOrdersColumns.push({
+      title: '采购排除',
+      width: 120,
+      dataIndex: 'excludeProcureNames',
+      fieldProps: {
+        mode: 'multiple',
+      },
+      valueType: 'select',
+      request: async () => {
+        const res = await postServiceOrderProvideProcurementRoles();
+        let options = res.data?.map((item) => {
+          return { label: item, value: item };
+        });
+        return options;
+      },
+      hideInTable: true,
+    });
+  }
+
+  /**
    * 仓库可以筛选发货仓库
    */
   if (roleCode === 'warehouseKeeper' || roleCode === 'admin') {
@@ -9,7 +9,7 @@ export function getReceivingCompanyOptions(PAYEE_OPTIONS: any) {
 export function isSupplier() {
   let userInfo = getUserInfo();
   if (userInfo) {
-    return ['首能', '枭源'].includes(userInfo.username);
+    return ['首能', '枭源'].includes(userInfo?.username);
   }
   return false;
 }
@@ -17,7 +17,49 @@ export function isSupplier() {
 export function isExaminer() {
   let userInfo = getUserInfo();
   if (userInfo) {
-    return userInfo.roleSmallVO?.code === 'examiner';
+    return ['examiner'].includes(userInfo?.roleSmallVO?.code);
+  }
+  return false;
+}
+
+export function isSales() {
+  let userInfo = getUserInfo();
+  if (userInfo) {
+    return ['salesRepresentative', 'salesManager'].includes(
+      userInfo?.roleSmallVO?.code,
+    );
+  }
+  return false;
+}
+
+export function isProcure() {
+  let userInfo = getUserInfo();
+  if (userInfo) {
+    return ['procure'].includes(userInfo?.roleSmallVO?.code);
+  }
+  return false;
+}
+
+export function isWarehousekeeper() {
+  let userInfo = getUserInfo();
+  if (userInfo) {
+    return ['warehouseKeeper'].includes(userInfo?.roleSmallVO?.code);
+  }
+  return false;
+}
+
+export function isAdmin() {
+  let userInfo = getUserInfo();
+  if (userInfo) {
+    return ['admin'].includes(userInfo?.roleSmallVO?.code);
+  }
+  return false;
+}
+
+export function isFinance() {
+  let userInfo = getUserInfo();
+  if (userInfo) {
+    return ['finance'].includes(userInfo?.roleSmallVO?.code);
   }
   return false;
 }