Merge remote-tracking branch 'origin/master'

# Conflicts: # src/services/definition.ts # src/services/request.ts

Merge remote-tracking branch 'origin/master'
# Conflicts: # src/services/definition.ts # src/services/request.ts
曾国涛
2 parents 073f9ae2 6b037d6d
Showing 4 changed files with 16 additions and 11 deletions
src/access.ts
src/pages/Order/constant.ts
src/pages/Order/index.tsx
src/pages/ResearchGroup/index.tsx
@@ -11,7 +11,7 @@ export default (initialState: API.UserInfo) =&gt; {
   return {
     canReadAdmin: canReadAdmin,
     canReadProcure: canReadProcure,
-    canReadLinda: username === 'Linda' || username === '吴量' || canReadAdmin,
+    canReadLinda: username === 'Linda',
     canReadAdminAndFinance: canReadFinance || canReadAdmin,
     canReadSales: canReadSales,
     canReadAdminAndFinanceAndSales:
@@ -429,14 +429,14 @@ export const MAIN_ORDER_COLUMNS = [
     hideInTable: true,
   },
   {
-    title: '销售代表',
-    dataIndex: 'salesCode',
+    title: '收货人',
+    dataIndex: 'customerName',
     valueType: 'text',
     hideInTable: true,
   },
   {
-    title: '收货人',
-    dataIndex: 'customerName',
+    title: '销售代表',
+    dataIndex: 'salesCode',
     valueType: 'text',
     hideInTable: true,
   },
@@ -781,7 +781,7 @@ const OrderPage = () =&gt; {
                 key={index}
                 onConfirm={() => {
                   window.open(
-                    '/onlinePreview?url=' +
+                    '/previewApi/onlinePreview?url=' +
                       encodeURIComponent(Base64.encode(item.url)),
                   );
                 }}
@@ -1837,7 +1837,7 @@ const OrderPage = () =&gt; {
                 onClick={() => {
                   createOptObject(optRecord.id, record.id);
                   setOrderDrawerVisible(true);
-                  setOrderOptType('after-sales');
+                  setOrderOptType('after_sales');
                 }}
               >
                 申请售后
@@ -3220,10 +3220,11 @@ const OrderPage = () =&gt; {
                               orderStatus !== 'UNAUDITED' &&
                               orderStatus !== 'AUDIT_FAILED' &&
                               orderStatus !== 'LEADER_PROCESS' &&
-                              orderStatus !== 'SALES_CONFIRM'
+                              orderStatus !== 'SALES_CONFIRM' &&
+                              orderStatus !== 'CREDIT_CONFIRM'
                             ) {
                               message.error(
-                                '请选择【未审核、审核失败、销售待确认】的订单进行编辑',
+                                '请选择【未审核、审核失败、销售待确认、赊账待审核】的订单进行编辑',
                               );
                               return;
                             }
@@ -158,7 +158,11 @@ const PrepaidPage = () =&gt; {
                           <div>名称：</div>
                         </Col>
                         <Col span={14}>
-                          <div>{accountInfo.realName}</div>
+                          <div>
+                            {accountInfo.realName === ''
+                              ? '用户'
+                              : accountInfo.realName}
+                          </div>
                         </Col>
                       </Row>
                       <Row gutter={4}>
@@ -196,7 +200,7 @@ const PrepaidPage = () =&gt; {
                   loadAccountInfo(accountId, accountPhone);
                 }}
               >
-                {accountName}
+                {accountName === '' ? '用户' : accountName}
               </Tag>
             </Popconfirm>
           );