Merge remote-tracking branch 'origin/master' into bug_fix

莫红玲
2 parents 6eeb7c9e 2522db6f
Showing 8 changed files with 81 additions and 46 deletions
src/pages/approval/FLowSetting/api.ts
src/pages/approval/FLowSetting/components/ConditionSetting.tsx
src/pages/approval/FLowSetting/components/Modal.tsx
src/pages/approval/FLowSetting/entity.ts
src/pages/approval/PreSetting/components/CreateItem.tsx
src/pages/approval/PreSetting/entity.ts
src/pages/approval/PreSetting/index.tsx
src/pages/pms/storage/StorageManage/interface.d.ts
 import request from '@/utils/request';
 import { http } from '@/typing/http';
-import { Approval_HOST, FVM_HOST, EHR_HOST, FINANCE2_HOST, PMS_HOST, ABILITY_HOST } from '@/utils/host';
+import { Approval_HOST, FVM_HOST, EHR_HOST, FINANCE2_HOST, PMS_HOST, ABILITY_HOST, } from '@/utils/host';
  
 type P<T> = Promise<http.PageResponse<T>>;
  
@@ -24,7 +24,8 @@ export function fetchProcessList(approvalConfigId: number): http.PromiseResp&lt;Flo
  * /erp/approval/config/save
  */
 export function saveApproveConfig(params: ApprovalSetteing.ApprovalListItems) {
-  return request.post(`${Approval_HOST}/erp/approval/config/save`, params);
+  return request.post(`${FINANCE2_HOST
+    }/erp/approval/config/save`, params);
 }
  
 /**
@@ -113,6 +114,14 @@ export function getStoragePage(params?: PartStorageSpace.QueryPageParam): http.P
  * 
  * /ability/erp/exam/config/standard/all/list
  */
-  export function getAbilityPage(): http.PromiseResp <PartStorageSpace.AbilityPageVO> {
+export function getAbilityPage(): http.PromiseResp<PartStorageSpace.AbilityPageVO[]> {
   return request.get(`${ABILITY_HOST}/erp/exam/config/standard/all/list`);
+}
+
+/**
+ * 款项列表
+ * /common/refundable/types
+ */
+export function getFoundPage(): http.PromiseResp<PartStorageSpace.FoundPageVO[]> {
+  return request.get(`${FINANCE2_HOST}/common/refundable/types`);
 }
 \ No newline at end of file
@@ -10,6 +10,7 @@ import {
   getPostTypeList,
   getAbilityPage,
   processDeleteApi, //删除流程
+  getFoundPage,
 } from "../api";
 import useInitial from "@/hooks/useInitail";
 import { getShopApi, getAllRoleCodeApi } from "@/common/api";
@@ -78,6 +79,8 @@ export default function ConditionSetting({ match }: Props) {
    * 能力提升业务类型列表
    */
   const { data: abilityList } = useInitial(getAbilityPage, [], {});
+  // 款项列表
+  const { data: foundList } = useInitial(getFoundPage, [], {});
  
   useEffect(() => {
     if (preConditonList.length) {
@@ -292,6 +295,7 @@ export default function ConditionSetting({ match }: Props) {
           preCondition={preCondition}
           accountList={accountList}
           fittingsList={fittingsList}
+          foundList={foundList}
         />
         <DetailItem detailItem={detailItem} setDetailItem={setDetailItem} />
       </PageHeaderWrapper>
@@ -42,6 +42,7 @@ interface Props {
   readOnly?: boolean;
   // preConditonList: any[];
   abilityList: PartStorageSpace.AbilityPageVO[]; // 能力提升列表;
+  foundList: PartStorageSpace.FoundPageVO[]; //款项列表
   preCondition: any[];
   fittingsList: PartStorageSpace.PageVO[];
   accountList: SpecialAccount.AccountInfo[];
@@ -66,6 +67,7 @@ export default function setModal(props: Props) {
     accountList,
     fittingsList,
     abilityList,
+    foundList,
   } = props;
   const [newData, setNewData] = useState<ApprovalProcess.InstanceInfo[]>([]);
   const [deepData, setDeepData] = useState<ApprovalProcess.InstanceInfo[]>([]);
@@ -262,7 +264,10 @@ export default function setModal(props: Props) {
                 : -Infinity;
  
             return (
-              <div style={{ marginBottom: judgeRule===1?75:20 }}>
+              <div
+                style={{ marginBottom: judgeRule === 1 ? 75 : 20 }}
+                key={`id_${index}`}
+              >
                 <React.Fragment key={`id_${index}`}>
                   <FormItem
                     label={`${index + 1}、${name || ""}(${
@@ -343,9 +348,6 @@ export default function setModal(props: Props) {
                           labelInValue
                           multiple
                           initType={1}
-                          // onChange={(value) => {
-                          //   console.log("value：", value);
-                          // }}
                           value={
                             originalData.length > 0
                               ? originalData.map((i: any) => ({
@@ -551,7 +553,6 @@ export default function setModal(props: Props) {
                         </Select>
                       </div>
                     )}
-
                     {/* 能力提升 */}
                     {type === TriggerType["能力提升业务类型"] && (
                       <div>
@@ -581,6 +582,36 @@ export default function setModal(props: Props) {
                         </Select>
                       </div>
                     )}
+                    {/* 款项 */}
+
+                    {type === TriggerType["款项"] && (
+                      <div>
+                        <Select
+                          disabled={readOnly}
+                          optionFilterProp="children"
+                          value={
+                            originalData.length > 0
+                              ? originalData.map((i: any) => ({
+                                  value: i.idOrCode,
+                                  label: i.name,
+                                }))
+                              : []
+                          }
+                          labelInValue
+                          mode="multiple"
+                          placeholder="请选择款项类型"
+                          onChange={(value) => {
+                            onChange(data, value, index);
+                          }}
+                        >
+                          {foundList.map((item) => (
+                            <Option value={item.value} key={item.value}>
+                              {item.name}
+                            </Option>
+                          ))}
+                        </Select>
+                      </div>
+                    )}
                   </FormItem>
                 </React.Fragment>
               </div>
@@ -16,13 +16,8 @@ export enum TriggerType {
   "车辆区域库" = 8,
   "资金账户" = 9,
   "能力提升业务类型" = 10,
-  // "数量" = 1,
-  // "金额" = 2,
-  // "门店" = 3,
-  // "岗位" = 4,
-  // "角色" = 5,
-  // "自定义" = 6,
-  // "区域库" = 7,
+  "款项" = 11,
+
 }
  
 export enum TriggerMode {
@@ -14,8 +14,6 @@ const layout = {
   wrapperCol: { span: 20 },
 };
 interface Props {
-  // visible: boolean;
-  // setVisible?: any;
   item: PreSetting.Item;
   setItem: any;
   approvalConfigId: number;
@@ -54,9 +52,7 @@ export default function CreateItem({
           .then((res) => {
             message.success("保存成功");
             setItem({visible: false});
-            // setVisible(false);
             setListLoading(true);
-            // setParams({ current: 1 }, true);
           })
           .catch((err) => message.error(err.message))
           .finally(() => {
@@ -69,7 +65,6 @@ export default function CreateItem({
     <Modal
       title={`${id?'编辑':'新增'}预设条件`}
       visible={visible}
-      // onCancel={() => setVisible(false)}
       onCancel={() => setItem({ visible: false })}
       onOk={() => form.submit()}
       confirmLoading={loading}
@@ -115,17 +110,13 @@ export default function CreateItem({
  
         <Form.Item
           noStyle
-          shouldUpdate={(prevValues, currentValues) =>
-            prevValues.type !== currentValues.type
-          }
+          shouldUpdate={(prevValues, currentValues) => prevValues.type !== currentValues.type}
         >
-          {({ getFieldValue }) =>
-            [1, 2].includes(getFieldValue("type")) ? (
-              <Form.Item name="unit" label="单位" rules={[{ required: true }]}>
-                <Input placeholder="请输入单位" maxLength={4} />
-              </Form.Item>
-            ) : null
-          }
+          {({ getFieldValue }) => ([1, 2].includes(getFieldValue("type")) ? (
+            <Form.Item name="unit" label="单位" rules={[{ required: true }]}>
+              <Input placeholder="请输入单位" maxLength={4} />
+            </Form.Item>
+            ) : null)}
         </Form.Item>
         {conditionType && (
           <Form.Item
@@ -136,14 +127,14 @@ export default function CreateItem({
             <Select placeholder="请选择">
               {[1, 2].includes(conditionType)
                 ? Judge_Rule1.map((item) => (
-                    <Option value={item.value} key={item.value}>
-                      {item.label}
-                    </Option>
+                  <Option value={item.value} key={item.value}>
+                    {item.label}
+                  </Option>
                   ))
                 : Judge_Rule2.map((item) => (
-                    <Option value={item.value} key={item.value}>
-                      {item.label}
-                    </Option>
+                  <Option value={item.value} key={item.value}>
+                    {item.label}
+                  </Option>
                   ))}
             </Select>
           </Form.Item>
@@ -12,9 +12,10 @@ export const Condition_Type = [
   { label: "车辆区域库", value: 8 },
   { label: "资金账户", value: 9 },
   { label: "能力提升业务类型", value: 10 },
+  { label: "款项", value: 11 },
 ];
-export enum Condition_Type_Enum{
-  "数量"=1,
+export enum Condition_Type_Enum {
+  "数量" = 1,
   "金额",
   "门店",
   "岗位",
@@ -24,7 +25,8 @@ export enum Condition_Type_Enum{
   "车辆区域库",
   "资金账户",
   "能力提升业务类型",
-} 
+  "款项"
+}
  
 // 判断规则，1区间、2大于等于、3小于等于、4大于、5小于、6等于、7属于、8不属于
 export const Judge_Rule1 = [
@@ -40,8 +42,8 @@ export const Judge_Rule2 = [
   { label: "不属于", value: 8 },
 ];
  
-export enum Judge_Rule_Enum{
-  "区间"=1,
+export enum Judge_Rule_Enum {
+  "区间" = 1,
   "大于等于",
   "小于等于",
   "大于",
@@ -63,10 +63,7 @@ export default function PreSetting({ match }: Props) {
           <Description term="审批编号">{approvalNo || ""}</Description>
         </DescriptionList>
         <div style={{ height: 15 }} />
-        <DescriptionList size="large" title="" col={1}>
-          {/* <Description term="审批名称">{approvalName || ""}</Description> */}
-          {/* <Description term="审批名称">{approvalName || ""}</Description> */}
-        </DescriptionList>
+      
         <div
           style={{
             marginBottom: 20,
@@ -82,7 +79,6 @@ export default function PreSetting({ match }: Props) {
         <Table
           dataSource={data}
           rowKey={(record) => `id_${record.id}`}
-          // pagination={false}
           loading={loading}
           scroll={{ x: 500, y: 350 }}
         >
@@ -27,6 +27,13 @@ declare namespace PartStorageSpace {
     name?: string, //业务类型名
   }
  
+  /**
+ * 款项列表项
+ */
+  interface FoundPageVO {
+    name?: string,
+    value?: string
+  }
   interface StoreDetail {
     id?: number,
     //仓库名