Merge branch 'master' into zgt

# Conflicts: # .idea/UniappTool.xml # src/pages/Order/constant.ts

Merge branch 'master' into zgt
# Conflicts: # .idea/UniappTool.xml # src/pages/Order/constant.ts
曾国涛
2 parents f1f64d22 cfbeebda
Showing 6 changed files with 43 additions and 16 deletions
src/access.ts
src/pages/Order/constant.ts
src/pages/Order/index.tsx
src/pages/ResearchGroup/components/ResearchGroupAddModal.tsx
src/pages/ResearchGroup/constant.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:
@@ -432,8 +432,8 @@ export const MAIN_ORDER_COLUMNS = [
     hideInTable: true,
   },
   {
-    title: '子订单编号',
-    dataIndex: 'subOrderId',
+    title: '收货人',
+    dataIndex: 'customerName',
     valueType: 'text',
     hideInTable: true,
   },
@@ -444,8 +444,8 @@ export const MAIN_ORDER_COLUMNS = [
     hideInTable: true,
   },
   {
-    title: '收货人',
-    dataIndex: 'customerName',
+    title: '子订单编号',
+    dataIndex: 'subOrderId',
     valueType: 'text',
     hideInTable: true,
   },
@@ -814,7 +814,7 @@ const OrderPage = () =&gt; {
                 key={index}
                 onConfirm={() => {
                   window.open(
-                    '/onlinePreview?url=' +
+                    '/previewApi/onlinePreview?url=' +
                       encodeURIComponent(Base64.encode(item.url)),
                   );
                 }}
@@ -1956,7 +1956,7 @@ const OrderPage = () =&gt; {
                 onClick={() => {
                   createOptObject(optRecord.id, record.id);
                   setOrderDrawerVisible(true);
-                  setOrderOptType('after-sales');
+                  setOrderOptType('after_sales');
                 }}
               >
                 申请售后
@@ -3424,10 +3424,11 @@ const OrderPage = () =&gt; {
                               orderStatus !== 'UNAUDITED' &&
                               orderStatus !== 'AUDIT_FAILED' &&
                               orderStatus !== 'LEADER_PROCESS' &&
-                              orderStatus !== 'SALES_CONFIRM'
+                              orderStatus !== 'SALES_CONFIRM' &&
+                              orderStatus !== 'CREDIT_CONFIRM'
                             ) {
                               message.error(
-                                '请选择【未审核、审核失败、销售待确认】的订单进行编辑',
+                                '请选择【未审核、审核失败、销售待确认、赊账待审核】的订单进行编辑',
                               );
                               return;
                             }
@@ -285,8 +285,9 @@ export default ({ setVisible, researchGroupId, onClose }) =&gt; {
       form.setFieldValue('accounts', accountIds);
     }
-    form.setFieldValue('group', researchGroupInfo.groupName);
-    form.setFieldValue('leader', researchGroupInfo.leaderName);
+    form.setFieldValue('groupName', researchGroupInfo.groupName);
+    form.setFieldValue('leaderName', researchGroupInfo.leaderName);
+    form.setFieldValue('companyName', researchGroupInfo.companyName);
   };
   useEffect(() => {
@@ -337,14 +338,14 @@ export default ({ setVisible, researchGroupId, onClose }) =&gt; {
         <Spin spinning={modalLoading} tip="加载中...">
           <ProForm.Group>
             <ProFormText
-              name="group"
+              name="groupName"
               label="课题组名称"
               placeholder="请输入课题组名称"
               rules={[{ required: true, message: '请输入课题组名称' }]}
             />
             <ProFormSelect
-              name="leader"
-              key="leader"
+              name="leaderName"
+              key="leaderName"
               width="lg"
               showSearch
               label="负责人"
@@ -352,6 +353,12 @@ export default ({ setVisible, researchGroupId, onClose }) =&gt; {
               rules={[{ required: true, message: '请输入课题组负责人' }]}
               options={salesCodeOptions}
             />
+            <ProFormText
+              name="companyName"
+              label="单位名称"
+              placeholder="请输入单位名称"
+              rules={[{ required: true, message: '请输入单位名称' }]}
+            />
           </ProForm.Group>
           <ProFormSelect
@@ -28,6 +28,15 @@ export const RESEARCH_GROUP_COLUMNS = [
     },
   },
   {
+    title: '单位名称',
+    dataIndex: 'companyName',
+    key: 'companyName',
+    fieldProps: {
+      placeholder: '请输入单位名称',
+    },
+    hideInSearch: true,
+  },
+  {
     title: '预存账号',
     dataIndex: 'accounts',
     key: 'accounts',
@@ -85,6 +94,12 @@ export const RESEARCH_GROUP_COLUMNS = [
     },
     hideInSearch: true,
   },
+  {
+    title: '公司名称',
+    dataIndex: 'companyNameLike',
+    key: 'companyNameLike',
+    hideInTable: true,
+  },
 ];
 export const RESEARCH_GROUP_MEMBER_REQUEST_COLUMNS = [
@@ -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>
           );