Merge branch 'bug_fix' of gitlab.feewee.cn:FEV2/fw-cms into ehr-ability

王强
2 parents 45201ff7 7043c73b
Showing 24 changed files with 429 additions and 82 deletions
config/routers/capital.ts
src/pages/attendance/FieldService/subpages/WorkAddress/components/TravelAddressModal.tsx
src/pages/capital/Maintenance/StockQuery/api.ts
src/pages/capital/Maintenance/StockQuery/components/Filter.tsx
src/pages/capital/Maintenance/StockQuery/index.tsx
src/pages/capital/ReceiveRules/subPages/GoodsDimension/components/PageAuthEdit/index.tsx
src/pages/capital/ReceiveRules/subPages/GoodsDimension/index.tsx
src/pages/capital/StandardMange/components/Add/index.tsx
src/pages/capital/StandardMange/components/List/index.tsx
src/pages/capital/StandardMange/index.tsx
src/pages/capital/StandardMange/interface.d.ts
src/pages/capital/StandardMange/store.ts
src/pages/capital/components/RenderGoodsSpec.tsx
src/pages/order3/RetailTask/api.ts
src/pages/pms/entity.ts
src/pages/pms/part/Repertory/components/EPCModal.tsx
src/pages/pms/part/Repertory/components/SpecEpcModal.tsx
src/pages/pms/partPlan/PlanPool/api.ts
src/pages/pms/partPlan/PlanPool/components/Filter.tsx
src/pages/pms/partPlan/PlanPool/components/PartTable.tsx
@@ -28,11 +28,19 @@ export default [
     component: './capital/StandardName'
   },
   {
+    path: '/ams/maintenance/stock', // 运维库存池查询
+    component: './capital/Maintenance/StockQuery'
+  },
+  {
+    path: '/ams/maintenance/standard/config/:disabled?', // 运维物品标准查询
+    component: './capital/StandardMange'
+  },
+  {
     path: '/ams/standardMange/receive/rules/goods/:id?/:name?', // 按物品领用规则
     component: './capital/ReceiveRules/subPages/GoodsDimension'
   },
   {
-    path: '/ams/standardMange/auth/goods/:id?', // 按物品授权分页列表
+    path: '/ams/standardMange/auth/goods/:id?/:disabled?', // 按物品授权分页列表
     component: './capital/ReceiveRules/subPages/GoodsDimension/components/PageAuthEdit'
   },
   {
@@ -46,6 +46,9 @@ export default function ModalIndex(props: Props) {
       if ((current.maxStayMinute || 0) >= 60) {
         maxStayMinute = (current.maxStayMinute || 0) % 60;
         maxStayHour = Math.floor((current.maxStayMinute || 0) / 60)
+      } else {
+        maxStayMinute = (current.maxStayMinute || 0)
+        maxStayHour = 0
       }
         let feildsValue: any = {
           ...current,
@@ -87,7 +90,7 @@ export default function ModalIndex(props: Props) {
   //      return;
   //    }
   // }
-    const maxStayMinute = params.maxStayMinute + params.maxStayHour * 60;
+    const maxStayMinute = (params.maxStayMinute || 0)+ (params.maxStayHour || 0) * 60;
     setLoading(true);
     let _param = {
       ...params,
+import request from '@/utils/request';
+import { AMS_HOST } from '@/utils/host';
+import { http } from '@/typing/http';
+
+export interface ListParams {
+  /**是否代管物品 1代管 0被领用 */
+  agent?: boolean;
+  /**资产类型 1固定资产 2低质品 3易耗品 */
+  type?: number;
+  /**关键字 */
+  keywords?: string;
+  /**库存来源类型 1.资产 2.配件 3.市场物料 */
+  sourceType?: number;
+  /**状态 1正常2已报废3已变卖 */
+  status?: number;
+  /**是否维修中 0正常1处理中 */
+  repair?: boolean;
+  /**是否报废中 0正常1处理中 */
+  scrap?: boolean;
+  /**是否变卖中 0正常1处理中 */
+  sell?: boolean;
+  /**是否调拨中 0正常1处理中 */
+  allocate?: boolean;
+  /**是否退回中 0正常1处理中 */
+  transfer?: boolean;
+  /**管理人员姓名
+  216 */
+  staffName?: string;
+  /** 物品唯一标识 */
+  uniqueCode?: string;
+  pageSize?: number;
+  current?: number;
+}
+export interface ListItems {
+  poolId: number;
+  fids: string;
+  name: string;
+  type: number;
+  standardId: number;
+  code: string;
+  uniqueCode: string;
+  unit: string;
+  specList: StanderList.AuthSpecList,
+  assetShopId: number;
+  assetShopName: string;
+  useShopId: number;
+  useShopName: string;
+  storageTime: number;
+  receiveTime: number;
+  storageNum: number;
+  staffId: number;
+  staffName: string;
+  manager: string;
+  unitPrice: number;
+}
+
+export function getDateApi(params: ListParams): http.PromisePageResp<ListItems> {
+  return request.get(`${AMS_HOST}/erp/operations/inventory/pool/page`, { params });
+}
+import React from 'react';
+import { Input, Radio, Row, Select } from 'antd';
+import { debounce } from 'lodash';
+import useInitail from '@/hooks/useInitail';
+import { getShopApi } from '@/common/api';
+
+const Option = Select.Option;
+interface Props {
+  setParams: Function;
+  innerParams: AmsSpec.ListParams;
+}
+export default function SeriesFilter({ setParams, innerParams }: Props) {
+  const { data: shopList } = useInitail<Array<CommonApi.OptionVO>, CommonApi.ShopParam>(getShopApi, [], {});
+
+  const fetchListByName = debounce(value => {
+    setParams({ ...value, current: 1 }, true);
+  }, 500);
+
+  const onSearch = (value: object) => setParams({ ...value, current: 1 }, true);
+  return (
+    <div>
+      <Row justify="space-between" style={{ flexWrap: "wrap" }}>
+        <Input.Search
+          allowClear
+          style={{ flex: 1, marginRight: 10 }}
+          onChange={e => fetchListByName({ keywords: e.target.value })}
+          onSearch={v => setParams({ keywords: v }, true)}
+          placeholder="物品名称/编码"
+        />
+        {/* <Input.Search
+          allowClear
+          style={{ flex: 1, marginRight: 10 }}
+          onChange={e => fetchListByName({ uniqueCode: e.target.value })}
+          onSearch={v => setParams({ uniqueCode: v }, true)}
+          placeholder="物品唯一标识"
+        /> */}
+        <Input.Search
+          allowClear
+          style={{ flex: 1, marginRight: 10 }}
+          onChange={e => fetchListByName({ staffName: e.target.value })}
+          onSearch={v => setParams({ staffName: v }, true)}
+          placeholder="管理人员姓名"
+        />
+        <Select
+          optionFilterProp="children"
+          showSearch
+          allowClear
+          placeholder="物品使用门店"
+          style={{ flex: 1, marginRight: 10 }}
+          onChange={(value) => onSearch({ useShopId: value })}
+        >
+          {shopList.map((item) => (
+            <Option key={item.id} value={item.id}>
+              {item.name}
+            </Option>
+          ))}
+        </Select>
+        <Select
+          optionFilterProp="children"
+          showSearch
+          allowClear
+          placeholder="物品归属门店"
+          style={{ flex: 1, marginRight: 10 }}
+          onChange={(value) => onSearch({ assetShopId: value })}
+        >
+          {shopList.map((item) => (
+            <Option key={item.id} value={item.id}>
+              {item.name}
+            </Option>
+          ))}
+        </Select>
+      </Row>
+
+      <Row justify="space-between" style={{ marginTop: 10 }}>
+        <Select style={{ flex: 1, marginRight: 10 }} allowClear onChange={(v) => onSearch({ type: v })} placeholder="资产类型">
+          <Option value={1} key={1}>固定资产</Option>
+          <Option value={2} key={2}>低值品</Option>
+          <Option value={3} key={3}>易耗品</Option>
+        </Select>
+        <Select style={{ flex: 1, marginRight: 10 }} allowClear onChange={(v) => onSearch({ agent: v })} placeholder="是否代管物品">
+          <Option value={1} key={1}>代管</Option>
+          <Option value={0} key={0}>被领用</Option>
+        </Select>
+        {/* <Select style={{ flex: 1, marginRight: 10 }} allowClear onChange={(v) => onSearch({ sourceType: v })} placeholder="库存来源类型">
+          <Option value={1} key={1}>资产</Option>
+          <Option value={2} key={2}>配件</Option>
+          <Option value={3} key={3}>市场物料</Option>
+        </Select> */}
+        <Select style={{ flex: 1, marginRight: 10 }} allowClear onChange={(v) => onSearch({ status: v })} placeholder="状态">
+          <Option value={1} key={1}>正常</Option>
+          <Option value={2} key={2}>已报废</Option>
+          <Option value={3} key={3}>已变卖</Option>
+        </Select>
+        <Select style={{ flex: 1, marginRight: 10 }} allowClear onChange={(v) => onSearch({ repair: v })} placeholder="是否维修中">
+          <Option value={0} key={0}>正常</Option>
+          <Option value={1} key={1}>处理中</Option>
+        </Select>
+      </Row>
+
+      <Row justify="space-between" style={{ marginTop: 10, marginBottom: 15 }}>
+        <Select style={{ flex: 1, marginRight: 10 }} allowClear onChange={(v) => onSearch({ sell: v })} placeholder="是否变卖中">
+          <Option value={0} key={0}>正常</Option>
+          <Option value={1} key={1}>处理中</Option>
+        </Select>
+        <Select style={{ flex: 1, marginRight: 10 }} allowClear onChange={(v) => onSearch({ allocate: v })} placeholder="是否调拨中">
+          <Option value={0} key={0}>正常</Option>
+          <Option value={1} key={1}>处理中</Option>
+        </Select>
+        <Select style={{ flex: 1, marginRight: 10 }} allowClear onChange={(v) => onSearch({ transfer: v })} placeholder="是否退回中">
+          <Option value={0} key={0}>正常</Option>
+          <Option value={1} key={1}>处理中</Option>
+        </Select>
+        <Select style={{ flex: 1, marginRight: 10 }} allowClear onChange={(v) => onSearch({ scrap: v })} placeholder="是否报废中">
+          <Option value={0} key={0}>正常</Option>
+          <Option value={1} key={1}>处理中</Option>
+        </Select>
+      </Row>
+    </div>
+  );
+}
 \ No newline at end of file
+import React from 'react';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import { Card, Table } from 'antd';
+import * as api from './api';
+import Column from 'antd/lib/table/Column';
+import Filter from './components/Filter';
+import moment from 'moment';
+import usePagination from '@/hooks/usePagination';
+import RenderGoodsSpec from '@/pages/capital/components/RenderGoodsSpec';
+import { AssetTypeEnum } from '@/pages/capital/entity';
+
+export default function SpecConfig() {
+  const { list, loading, paginationConfig, setParams, innerParams, setLoading } = usePagination(api.getDateApi, { status: 1 });
+
+  return (
+    <PageHeaderWrapper title="库存池查询">
+      <Card>
+        <Filter setParams={setParams} innerParams={innerParams} />
+        <Table
+          dataSource={list}
+          loading={loading}
+          pagination={paginationConfig}
+          rowKey="poolId"
+          size="small"
+        >
+          <Column title="物品名称" dataIndex="name" />
+          <Column title="物品编码" dataIndex="code" />
+          <Column title="唯一标识" dataIndex="uniqueCode" />
+          <Column
+            title="型号规格"
+            dataIndex="specList"
+            width="16%"
+            ellipsis
+            render={(text, record) => <RenderGoodsSpec specList={text} />}
+          />
+          <Column
+            title="物品类型"
+            dataIndex="type"
+            render={(value) => (
+              <span>{AssetTypeEnum[value]}</span>
+            )}
+          />
+          <Column title="资产归属门店" dataIndex="assetShopName" />
+          <Column title="使用门店" dataIndex="useShopName" />
+          <Column title="是否代管" dataIndex="agent" render={t => (t ? "是" : "否")} />
+          <Column title="库存数量" dataIndex="storageNum" render={(t, record: api.ListItems) => `${t || 0}${record.unit}`} />
+          <Column title="管理员工" dataIndex="staffName" />
+          <Column title="入库时间" dataIndex="storageTime" render={(t) => t && moment(t).format("YYYY-MM-DD hh:mm") || '--'} />
+          <Column title="领用时间" dataIndex="receiveTime" render={(t) => t && moment(t).format("YYYY-MM-DD hh:mm") || '--'} />
+          {/* <Column title="采购单价金额(元)" dataIndex="unitPrice" /> */}
+        </Table>
+      </Card>
+    </PageHeaderWrapper>
+  );
+}
 \ No newline at end of file
@@ -18,7 +18,7 @@ interface Props {
 export default function SpecConfig(props: Props) {
   const { match } = props;
-  const { id } = match.params;
+  const { id, disabled } = match.params;
   const { list, loading, setLoading, paginationConfig, innerParams, setParams } = usePagination(getGoodsAuthDetail, { standardId: id });
   const [confirLoaing, setConfirLoading] = useState<boolean>(false);
   const [modalPa, setModalPa] = useState({ visible: false, rowValue: undefined });
@@ -82,7 +82,7 @@ export default function SpecConfig(props: Props) {
               />
             </div>
           </Row>
-          <Button type="primary" icon={<PlusOutlined />} onClick={() => setModalPa({ visible: true })}>新增</Button>
+          {!disabled && (<Button type="primary" icon={<PlusOutlined />} onClick={() => setModalPa({ visible: true })}>新增</Button>)}
         </Row>
         <Table
           dataSource={list}
@@ -118,7 +118,7 @@ export default function SpecConfig(props: Props) {
             align="center"
             title="操作"
             render={(value) => {
-              return (
+              return !disabled ? (
                 <>
                   <Button type="link" onClick={() => edit(value)}>
                     编辑
@@ -130,7 +130,7 @@ export default function SpecConfig(props: Props) {
                     </Button>
                   </Popconfirm>
                 </>
-              );
+              ) : null;
             }}
           />
         </Table>
@@ -53,9 +53,10 @@ export default function Index(props: Props) {
               <RenderSelectGoos />
             </Form.Item>
           ) : (
-            <Form.Item label="物品名称">
-              <Input bordered={false} value={name} />
-            </Form.Item>
+            // <Form.Item label="物品名称">
+            //   <Input bordered={false} value={name} />
+            // </Form.Item>
+            null
           )}
           <Form.Item label="按门店授权" name="shopAuthPostList" rules={[{ required: true, message: '添加授权信息' }]}>
             <AuthTableList />
@@ -17,10 +17,13 @@ const Option = Select.Option;
 const RadioGroup = Radio.Group;
 export default function AddItem() {
-  const { typeName, data = [], currentItem = {}, unitItem, setBreadcrumbs, setLoading, setCurrentBreadcrumb, setIsPart } = useStore()
+  const { typeName, data = [], currentItem = {}, unitItem, setBreadcrumbs, setLoading, setCurrentBreadcrumb, setIsPart, editDisabled } = useStore();
   const [saveConfig, setSaveConfig] = useState<boolean>(false);
   const [nameId, setNameId] = useState<number>();
   const [visible, setVisible] = useState(false);
+  const [partValue, setPartValue] = useState<{
+    partId?: number, partCode?: string,
+  }>({});
   const [form] = Form.useForm();
   useEffect(() => {
@@ -33,11 +36,13 @@ export default function AddItem() {
       part: Number(currentItem.part) || 0,
       purchaseChannelList: currentItem.purchaseChannelList && JSON.stringify(currentItem) != '{}' ? currentItem.purchaseChannelList.map(i => ({ value: i.subjectId, label: i.subjectName })) : undefined,
     });
+    currentItem.partCode && setPartValue({ partCode: currentItem.partCode, partId: currentItem.partId });
   }, []);
   function save(feildValue: any) {
     const params = {
       ...feildValue,
+      ...partValue,
       id: currentItem.id,
       name: currentItem.name || feildValue.name.label || feildValue.name,
       nameId: currentItem.nameId || feildValue.name.value || nameId,
@@ -49,6 +54,7 @@ export default function AddItem() {
     api.saveForm(params).then(res => {
       setSaveConfig(false);
       setNameId(undefined);
+      setPartValue({});
       if (res.data && !currentItem.id) {
         Modal.confirm({
           title: '保存成功',
@@ -57,7 +63,7 @@ export default function AddItem() {
           okText: '去授权',
           cancelText: '返回',
           onOk() {
-            history.push(`/ams/standardMange/receive/rules/goods/${res.data}/${params.name}`);
+            history.push(`/ams/standardMange/receive/rules/goods/${res.data}/name`);
           },
           onCancel() {
             setLoading(true);
@@ -104,7 +110,8 @@ export default function AddItem() {
     }).catch(e => {
       message.error(e.message);
     });
-    form.setFieldsValue({ name: item.partName, specList: spec, type: 2 });
+    setPartValue({ partCode: item.partCode, partId: item.id });
+    form.setFieldsValue({ name: item.partName, partCode: item.partCode, partId: item.id, specList: spec, type: 2 });
   }
   return (
@@ -112,7 +119,7 @@ export default function AddItem() {
       <h1 style={{ marginBottom: 20 }}>1.基本信息</h1>
       <Form {...layout} form={form} onFinish={save}>
         <Form.Item label="是否配件" name="part" rules={[{ required: true, message: '请选择' }]}>
-          <RadioGroup onChange={(e) => { changeSpc(e.target.value); }}>
+          <RadioGroup disabled={!!editDisabled} onChange={(e) => { changeSpc(e.target.value); }}>
             <Radio value={1}>是</Radio>
             <Radio value={0}>否</Radio>
           </RadioGroup>
@@ -147,6 +154,7 @@ export default function AddItem() {
             labelInValue
             optionFilterProp="children"
             showSearch
+            disabled={!!editDisabled}
           >
             {unitItem.map((i: StanderList.UnitItem) => (
               <Option value={i.id} key={i.id}>{i.unitName}</Option>
@@ -154,19 +162,19 @@ export default function AddItem() {
           </Select>
         </Form.Item>
         <Form.Item label="状态" name="status" valuePropName="checked" rules={[{ required: true, message: '请选择' }]}>
-          <Switch checkedChildren="启用" unCheckedChildren="禁用" />
+          <Switch disabled={!!editDisabled} checkedChildren="启用" unCheckedChildren="禁用" />
         </Form.Item>
         <Form.Item noStyle shouldUpdate={(prevValues, currentValues) => prevValues.type != currentValues.type}>
           {({ getFieldValue }): any => {
             return getFieldValue("type") === 1 ? (
               <Form.Item label="摊销周期 (月)" name="amortizePeriod" rules={[{ required: true, message: '请输入摊销周期' }]}>
-                <InputNumber min={0} style={{ width: '100%' }} placeholder="请输入" />
+                <InputNumber disabled={!!editDisabled} min={0} style={{ width: '100%' }} placeholder="请输入" />
               </Form.Item>
             ) : null;
           }}
         </Form.Item>
         <Form.Item label="备注" name="remark">
-          <Input.TextArea placeholder="请输入" allowClear />
+          <Input.TextArea disabled={!!editDisabled} placeholder="请输入" allowClear />
         </Form.Item>
         <h1 style={{ marginBottom: 20 }}>2.规格型号</h1>
@@ -180,7 +188,7 @@ export default function AddItem() {
             noStyle
             rules={[{ required: true, message: '最大采购金额（单个物品）' }]}
           >
-            <InputNumber style={{ width: 150 }} min={0} precision={4} placeholder="请输入金额" />
+            <InputNumber disabled={!!editDisabled} style={{ width: 150 }} min={0} precision={4} placeholder="请输入金额" />
           </Form.Item>
           <span style={{ marginLeft: 10 }}>元</span>
         </Form.Item>
@@ -188,16 +196,16 @@ export default function AddItem() {
           {({ getFieldValue }): any => {
             return getFieldValue("type") === 3 ? (
               <Form.Item label="最小单位采购数量" name="minNum" {...layout} rules={[{ required: true, message: '请输入最小采购数量' }]}>
-                <InputNumber style={{ width: 150 }} min={0} placeholder="请输入单位数量" />
+                <InputNumber disabled={!!editDisabled} style={{ width: 150 }} min={0} placeholder="请输入单位数量" />
               </Form.Item>
             ) : null;
           }}
         </Form.Item>
         <Form.Item label="计划提前天数" name="planAheadDay" {...layout}>
-          <InputNumber style={{ width: 150 }} min={0} placeholder="请输入" />
+          <InputNumber disabled={!!editDisabled} style={{ width: 150 }} min={0} placeholder="请输入" />
         </Form.Item>
         <Form.Item label="采购渠道" name="purchaseChannelList" rules={[{ required: true, message: '请选择采购渠道' }]}>
-          <Select placeholder="请选择采购渠道" allowClear labelInValue mode="multiple" showSearch optionFilterProp="children">
+          <Select disabled={!!editDisabled} placeholder="请选择采购渠道" allowClear labelInValue mode="multiple" showSearch optionFilterProp="children">
             {(data || []).map((i: any) => (
               <Option value={i.id} key={i.id}>{i.name}</Option>
             ))}
@@ -205,7 +213,7 @@ export default function AddItem() {
         </Form.Item>
         <h1 style={{ marginBottom: 20 }}>4.领用条件</h1>
         <Form.Item label="领用前提条件" name="premise" rules={[{ required: true, message: '请选择' }]}>
-          <Select placeholder="请选择">
+          <Select disabled={!!editDisabled} placeholder="请选择">
             <Option value={0} key={0}>无限制</Option>
             <Option value={1} key={1}>入职后</Option>
             <Option value={2} key={2}>转正后</Option>
@@ -215,15 +223,15 @@ export default function AddItem() {
           {({ getFieldValue }): any => {
             const premise = getFieldValue("premise");
             return premise ? (
-              <Form.Item label={premise === 1 ? "入职后" :"转正后"} name="premiseValue" {...layout} rules={[{ required: true, message: '请输入' }]}>
-                <InputNumber style={{ width: '100%' }} addonAfter="月" min={0} placeholder="请输入领取前提条件值" />
+              <Form.Item label={premise === 1 ? "入职后" : "转正后"} name="premiseValue" {...layout} rules={[{ required: true, message: '请输入' }]}>
+                <InputNumber disabled={!!editDisabled} style={{ width: '100%' }} addonAfter="月" min={0} placeholder="请输入领取前提条件值" />
               </Form.Item>
             ) : null;
           }}
         </Form.Item>
         <Row justify="center">
           <Button type="primary" onClick={() => { setBreadcrumbs([{ name: '列表', key: 'list' }]); setCurrentBreadcrumb({ name: '列表', key: 'list' }); }}>返回</Button>
-          <Button style={{ marginLeft: 25 }} type="primary" loading={saveConfig} onClick={() => form.submit()}>保存</Button>
+          <Button style={{ marginLeft: 25 }} type="primary" disabled={!!editDisabled} loading={saveConfig} onClick={() => form.submit()}>保存</Button>
         </Row>
       </Form>
       <SelectPartsTable
@@ -17,7 +17,8 @@ import { AssetTypeEnum } from &#39;@/pages/capital/entity&#39;;
 const Option = Select.Option;
 export default function List() {
-  const { typeName, setIsPart, breadcrumbs, MenuItems, setCurrentItem, innerParams, list, setBreadcrumbs, setLoading, setParams, paginationConfig, loading, setCurrentBreadcrumb } = useStore();
+  const { typeName, setIsPart, breadcrumbs, MenuItems, setCurrentItem, innerParams,
+    list, setBreadcrumbs, setLoading, setParams, paginationConfig, loading, setCurrentBreadcrumb, editDisabled } = useStore();
   const [switchLoading, setSwitchLoading] = useState(false);
   function editAdd(value?: any) {
@@ -51,7 +52,6 @@ export default function List() {
   });
   const handleMenuClick: MenuProps['onClick'] = (e) => {
-    console.log("handleMenuClick", e.key);
     switch (e.key) {
       case '1':
         history.push("/ams/standardMange/receive/rules/goods");
@@ -68,8 +68,9 @@ export default function List() {
   };
   const clickToAuth = (item: StanderList.ListVO) => {
-    history.push(`/ams/standardMange/auth/goods/${item.id}`);
+    history.push(`/ams/standardMange/auth/goods/${item.id}/${editDisabled || ''}`);
   };
+
   return (
     <Card>
       <Row justify="space-between">
@@ -85,29 +86,35 @@ export default function List() {
             禁用
           </Radio.Button>
         </Radio.Group>
-        <Select style={{ width: 200 }} allowClear onChange={(e) => _onChangeType({ type: e })} placeholder="请选择类型">
+        <Select allowClear onChange={(e) => _onChangeType({ type: e })} placeholder="请选择类型">
           {typeName.map(i => (
             <Option value={i.type} key={i.type}>{i.name}</Option>
           ))}
         </Select>
+        <Select allowClear onChange={(v) => _onChangeType({ part: v })} placeholder="是否配件">
+          <Option value={1} key={1}>是</Option>
+          <Option value={0} key={0}>否</Option>
+        </Select>
         <Search
           style={{ width: 260 }}
           placeholder="搜索资产名称/型号"
           allowClear
           onChange={(e) => _onChange(e.target.value)}
         />
-        <div>
-          <Dropdown
-            overlay={
-              <Menu onClick={handleMenuClick} items={MenuItems} />
-            }
-          >
-            <Button icon={<SnippetsOutlined />} type="primary" style={{ width: 100, marginRight: 20 }}>
-              领用授权
-            </Button>
-          </Dropdown>
-          <Button type="primary" icon={<PlusOutlined />} onClick={() => editAdd(undefined)}>新增</Button>
-        </div>
+        {!editDisabled && (
+          <div>
+            <Dropdown
+              overlay={
+                <Menu onClick={handleMenuClick} items={MenuItems} />
+              }
+            >
+              <Button icon={<SnippetsOutlined />} type="primary" style={{ width: 100, marginRight: 20 }}>
+                领用授权
+              </Button>
+            </Dropdown>
+            <Button type="primary" icon={<PlusOutlined />} onClick={() => editAdd(undefined)}>新增</Button>
+          </div>
+        )}
       </Row>
       <Table
@@ -146,6 +153,7 @@ export default function List() {
               unCheckedChildren="关闭"
               checked={!!value.status}
               loading={switchLoading}
+              disabled={!!editDisabled}
               onChange={() => changeSwich(value)}
             />
           )}
@@ -166,7 +174,7 @@ export default function List() {
           align="center"
           render={(record: StanderList.ListVO) => (
             <>
-              <Button type="link" style={{ padding: 0 }} onClick={() => { editAdd(record); }}>编辑</Button>
+              <Button type="link" style={{ padding: 0 }} onClick={() => { editAdd(record); }}> {!editDisabled ? "编辑" : "查看"}</Button>
               <Divider type="vertical" />
               <Button type="link" style={{ padding: 0 }} onClick={() => { clickToAuth(record); }}>授权</Button>
             </>
@@ -8,9 +8,15 @@ import AddItem from &#39;./components/Add&#39;;
 export const { Provider, useStore } = createStore(store);
-function EditMange() {
+function EditMange(props: any) {
+  const { match } = props;
+  const { disabled } = match.params;
   const [IndexDOM, setIndexDOM] = useState(<List />);
-  const { setLoading, currentItem, breadcrumbs, currentBreadcrumb, setCurrentItem, setBreadcrumbs, setCurrentBreadcrumb } = useStore();
+  const { setLoading, currentItem, breadcrumbs, currentBreadcrumb, setCurrentItem, setBreadcrumbs, setEditDisabled, setCurrentBreadcrumb } = useStore();
+
+  useEffect(() => {
+    setEditDisabled(!!disabled);
+  }, [disabled]);
   useEffect(() => {
     switch (currentBreadcrumb.key) {
@@ -49,4 +55,4 @@ function EditMange() {
   );
 }
-export default () => <Provider><EditMange /></Provider>;
 \ No newline at end of file
+export default (props: any) => <Provider><EditMange {...props} /></Provider>;
 \ No newline at end of file
@@ -6,6 +6,8 @@ declare namespace StanderList {
     type?: number, //物品类型 1固定资产2低值品3易耗品
     name?: string, //物品名称
     nameId?: number,
+    partCode?: string, 
+    partId?: number,
     unit?: number, //单位 1个2只3把4枚5台6包7车8瓶9壶10套11张12打13担
     unitName?: string,
     spec?: string, //型号规格
@@ -22,6 +22,8 @@ export default function useStore() {
   const { list: postList, loading: postLoading } = usePagination(api.getPostList, {});
   const { list, setParams, paginationConfig, innerParams, loading, setLoading } = usePagination(api.getListApi, { status: 1 });
   const [isPart, setIsPart] = useState<boolean>(false);
+  /**是否可编辑 */
+  const [editDisabled, setEditDisabled] = useState<boolean>(false);
   const typeName = [
     { name: '固定资产', type: 1 },
@@ -60,6 +62,8 @@ export default function useStore() {
     setLoading,
     isPart,
     setIsPart,
-    MenuItems
+    MenuItems,
+    editDisabled, 
+    setEditDisabled
   };
 }
 \ No newline at end of file
-import React from 'react';
-import { Popover } from 'antd';
+import React, { useCallback, useState } from 'react';
+import { Button, Modal, Popover, Table } from 'antd';
 interface Props {
   specList: StanderList.AuthSpecList[]
 }
 export default function RenderGoodsSpec({ specList }: Props) {
+  const [visible, setVisible] = useState(false);
   const items = (specList || []).map(i => `${i.standardSpecName}：${i.specDetails}`);
+  const RenderSpecModal = useCallback(() => (visible ? (
+    <SpecModal
+      visible={visible}
+      onCancel={() => setVisible(false)}
+      items={specList}
+    />
+  ) : null), [visible]);
   return (
-    <Popover
-      placement="topLeft"
-      content={<div style={{ maxWidth: 260 }}>{items.join('；')}</div>}
-    >
-      <div>
-        {items.slice(0, 3).map((i: string) => {
-          return (
-            <p key={i} style={{ margin: 0, fontSize: 12 }}>{i}</p>
-          );
-        })}
-        {items.length > 3 ? (<span>...</span>) : null}
-      </div>
-    </Popover>
+    <>
+      <Popover
+        placement="topLeft"
+        content={<div style={{ maxWidth: 260 }}>{items.join('；')}</div>}
+      >
+        <div>
+          {items.slice(0, 3).map((i: string) => {
+            return (
+              <p key={i} style={{ margin: 0, fontSize: 12 }}>{i}</p>
+            );
+          })}
+          {items.length > 3 ? (<span>...</span>) : null}
+        </div>
+        <Button type="link" style={{ fontSize: 12, padding: 0 }} onClick={() => setVisible(true)}>查看</Button>
+      </Popover>
+      {RenderSpecModal()}
+    </>
+  );
+}
+
+function SpecModal({ items, onCancel, visible }: any) {
+  const columns = [
+    {
+      title: '规格名称',
+      dataIndex: 'standardSpecName',
+    },
+    {
+      title: '规格内容',
+      dataIndex: 'specDetails',
+    },
+    {
+      title: '排序',
+      dataIndex: 'sort',
+    },
+  ];
+
+  return (
+    <Modal title="规格属性" open={visible} onCancel={onCancel} footer={false}>
+      <Table
+        pagination={false}
+        bordered
+        rowKey="standardSpecName"
+        dataSource={items}
+        size="small"
+        columns={columns}
+      />
+    </Modal>
   );
 }
 \ No newline at end of file
@@ -18,6 +18,7 @@ export interface ShopTaskList {
   clueDealTaskCount?: number // 线索到店零售数量
   clueDealTaskRate?: number // 线索到店零售占比
   staffTaskList?: StaffTaskList[]//员工任务列表
+  addedValueTask?: number
 }
 interface StaffTaskList {
@@ -26,6 +27,7 @@ interface StaffTaskList {
   taskCount?: number//任务数量
   clueDealTaskCount?: number // 线索到店零售数量
   regularMonth?: number//转正几个月
+  addedValueTask?: number
 }
 export interface saveParams {
   id?: number,
@@ -190,12 +190,12 @@ export const planPoolTypeData = [
 export const typeReceiverObj: {[key: string]: string} = {
   '售后工单锁定': '服务',
   '装潢零售锁定': '销售',
-  '调件锁定': '',
+  '调出锁定': '',
   '': '',
 };
 export const typeSenderObj: {[key: string]: string} = {
-  '售后工单锁定': '送修人',
-  '装潢零售锁定': '下单人',
-  '调件锁定': '',
+  '售后工单锁定': '送修人：',
+  '装潢零售锁定': '下单人：',
+  '调出锁定': '',
   '': '',
 };
@@ -4,7 +4,6 @@ import { useStore } from &#39;../index&#39;;
 import usePagination from '@/hooks/usePagination';
 import { getEpcdetailApi, deleteApi } from '../api';
 import AddepcModal from './AddepcModal';
-import debounce from 'lodash/debounce';
 const { Column } = Table;
@@ -14,9 +13,9 @@ export default function FactoryEpcDetailModal() {
   const [addVisible, setAddVisible] = useState(false);
   const { list, loading, setLoading, setParams, paginationConfig } = usePagination(getEpcdetailApi, { partCode: currentItem.partCode }, { delay });
-  const _onChange = debounce((param: string) => {
+  const _onChange = (param: string) => {
     setParams({ partCode: currentItem.partCode, current: 1, keywords: param }, true);
-  }, 500);
+  };
   useEffect(() => {
     if (currentItem.partCode) {
@@ -81,7 +80,8 @@ export default function FactoryEpcDetailModal() {
             placeholder="搜索车型代码"
             allowClear
             style={{ width: 200 }}
-            onChange={(e) => _onChange(e.target.value)}
+            onSearch={v => _onChange(v)}
+            enterButton
           />
           <Button type="primary" onClick={() => { setAddVisible(true); setCurrentInfo({}); }}>新增</Button>
         </div>
@@ -79,11 +79,11 @@ export default function specEcpModal() {
       <Card title="知识库信息">
         <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center', marginBottom: 10 }}>
           <Input.Search
-            placeholder="输入关键词"
+            placeholder="搜索配件编码/名称"
             allowClear
-            style={{ width: 200 }}
+            style={{ width: 240 }}
             onSearch={(v) => _onChange(v)}
-            onChange={e => _onChange(e.target.value)}
+            enterButton
           />
           <Button type="primary" onClick={() => { setAddVisible(true); setCurrentInfo({}); }}>新增</Button>
         </div>
@@ -13,6 +13,7 @@ export interface Params {
   storageId?: number; // Form
   isOil?: boolean;
   keywords?: string
+  poolType?:number
 }
 export interface ListVO {
@@ -40,6 +41,8 @@ export interface ListVO {
   unit?: string; // 采购规格(配件展示)
   splitUnit?: string; // 拆分件规格(配件展示)
   splitCnt?: number; // 拆分件数量(配件展示)
+  typeName?:string
+  partType?:number
 }
 /**
@@ -7,7 +7,6 @@ import usePagination from &quot;@/hooks/usePagination&quot;;
 import {getStoragePage} from "@/pages/pms/storage/StorageManage/api";
 import useInitail from "@/hooks/useInitail";
 import * as api from "@/pages/pms/storage/partShop/api";
-import {getPartTypeApi} from '@/pages/pms/part/Repertory/api';
 import PmsSelect from '@/pages/pms/comonents/PmsSelect';
 const { Search } = Input;
@@ -15,8 +14,7 @@ const { Search } = Input;
 export default function Filter() {
   const { list: storages } = usePagination<PartStorageSpace.PageVO>(getStoragePage, {pageSize: 1000});
   const { data: shops } = useInitail<PmsStoragePartShop.Option[], {}>(api.getShopApi, [], {});
-  const { dfParams, setDfParams } = useStore();
-  const { data: partTypeData } = useInitail(getPartTypeApi, [], {});
+  const { dfParams, setDfParams, partTypeData } = useStore();
   const handleChangeKeywords = debounce((value: string) => {
     setDfParams({ ...dfParams, current: 1, keywords: value });
@@ -16,7 +16,7 @@ interface Props {
   id?: number, // 上一个列表ID
 }
 export default function Index(props: Props = {}) {
-  const { dfParams, key } = useStore();
+  const { dfParams, key, partTypeData } = useStore();
   const {showAnalyse=true} = props;
   const { data: parts, setParams } = useInitial(getList, [], {...dfParams, ...props});
   const [visible, setVisible] = useState(false);
@@ -35,6 +35,8 @@ export default function Index(props: Props = {}) {
       <Table rowKey={(v: ListVO) => `${v.id}`} scroll={{y: 500, x: 2000}} dataSource={parts || []} pagination={false}>
         <Column title="配件编码" dataIndex="code" fixed="left" />
         <Column title="配件名称" dataIndex="name" />
+        <Column title="来源类型" dataIndex="typeName" />
+        <Column title="配件类型" dataIndex="partType" render={t => partTypeData.find(i => i.value == t)?.label} />
         <Column title="采购单价" dataIndex="price" />
         <Column title="采购数量" dataIndex="cnt" />
         <Column title="采购规格" dataIndex="unit" />
@@ -82,8 +84,6 @@ export default function Index(props: Props = {}) {
                 </a>
               )}
             />
-            <Column title="拆分件规格" dataIndex="splitUnit" />
-            <Column title="拆分件数量" dataIndex="splitCnt" />
           </>
         )}
       </Table>
@@ -12,7 +12,7 @@ interface Props {
   type?: number, // 类型1区域库2库房3车系4车型5配件
 }
 export default function Index(props: Props = {}) {
-  const { dfParams, key } = useStore();
+  const { dfParams, key, partTypeData } = useStore();
   const [form] = Form.useForm();
   const { data: parts, setParams } = useInitial(getList, [], dfParams);
   const [visible, setVisible] = useState(false);
@@ -40,6 +40,7 @@ export default function Index(props: Props = {}) {
         <Column title="库房名称" dataIndex="storageName" />
         <Column title="门店名称" dataIndex="shopName" />
         <Column title="来源类型" dataIndex="typeName" />
+        <Column title="配件类型" dataIndex="partType" render={t => partTypeData.find(i => i.value == t)?.label} />
         <Column title="采购规格" dataIndex="unit" render={t => t || '--'} />
         <Column title="采购数量" dataIndex="cnt" />
         <Column title="采购单价" dataIndex="price" />
 import { useState } from 'react';
+import useInitail from "@/hooks/useInitail";
+import { getPartTypeApi } from '@/pages/pms/part/Repertory/api';
 export default function useStore() {
   const [dfParams, setDfParams] = useState<any>({});
   const [key, setKey] = useState<any>('1');
+  const { data: partTypeData } = useInitail(getPartTypeApi, [], {});
+
   return {
     dfParams,
     setDfParams,
     key,
-    setKey
+    setKey,
+    partTypeData
   };
 }
@@ -10,6 +10,9 @@ import {purchaseApply, getrelationlist, EditItem} from &#39;../api&#39;;
 import {getList, ListVO, Params} from '@/pages/pms/partPlan/PlanPool/api';
 import _ from 'lodash';
 import useInitial from '@/hooks/useInitail';
+import PmsSelect from '@/pages/pms/comonents/PmsSelect';
+import { getPartTypeApi } from '@/pages/pms/part/Repertory/api';
+import {planPoolTypeData} from '@/pages/pms/entity';
 const Option = Select.Option;
 const {Item} = Form;
@@ -33,7 +36,8 @@ export default function PartStorageModal({ onCancel, visible, itemData, setItemD
   const {data: planeData, setParams, setData: setPlaneData} = useInitial<ListVO[], Params>(getList, [], {}, delay);
   const {data: casData, setParams: casSetParams, setData: casSetData} = useInitial<poolitem[], Params>(getPurchasePool, [], {}, delay);
   const [planePart, setPlanePart] = useState<ListVO[]>([]);
-  
+  const { data: partTypeData } = useInitial(getPartTypeApi, [], {});
+
   const [choosePartVisable, setChoosePartVisable] = useState(false);
   const [selectedParts, setSelectedParts] = useState<any[]>([]);
   const [form] = Form.useForm();
@@ -259,7 +263,23 @@ export default function PartStorageModal({ onCancel, visible, itemData, setItemD
               allowClear
               placeholder="请输入配件名称/编码"
               onChange={e => setParams({keywords: e.target.value}, true)}
-              style={{ width: 240 }}
+              style={{ width: 210 }}
+            />
+            <PmsSelect
+              allowClear
+              style={{ width: 180, marginRight: 10, marginLeft: 10}}
+              onChange={v => {
+                setParams({poolType: v}, true);
+              }}
+              placeholder="请选择来源类型"
+              options={planPoolTypeData.map(i => ({value: i.value, label: i.label}))}
+            />
+            <PmsSelect
+              allowClear
+              style={{ width: 180}}
+              onChange={v => setParams({partType: v}, true)}
+              placeholder="请选择配件类型"
+              options={partTypeData.map(i => ({value: i.value, label: i.label}))}
             />
           </div>
           <Table
@@ -278,6 +298,8 @@ export default function PartStorageModal({ onCancel, visible, itemData, setItemD
           >
             <Column title="配件名称" dataIndex="partName" />
             <Column title="配件编码" dataIndex="partCode" />
+            <Column title="数据来源" dataIndex="typeName" />
+            <Column title="配件类型" dataIndex="partType" render={t => partTypeData.find(i => i.value == t)?.label} />
             <Column title="采购单价(元)" dataIndex="price" />
             <Column title="采购数量" dataIndex="cnt" />
             <Column title="总价(元)" render={r => _.ceil((r.cnt * r.price), 2)} />
@@ -60,7 +60,7 @@ export default function Index({ item = {}, visible, onCancel }: Props) {
                 <div>{`锁定库存数: ${it.lockCnt || 0}件`}</div>
                 <div>{`锁库天数: ${(it.days || 0).toFixed(0)}天`}</div>
                 {!!obj.receiverName && <div>{`${typeReceiverObj[it.type || '']}顾问: ${obj.receiverName}`}</div>}
-                {!!obj.senderName && <div>{`${typeSenderObj[it.type || '']}: ${obj.senderName}`}</div>}
+                {!!obj.senderName && !!typeSenderObj[it.type || ''] && <div>{`${typeSenderObj[it.type || '']}${obj.senderName}`}</div>}
                 {!!obj.ownerName && <div>{`车主: ${obj.ownerName}`}</div>}
                 {!!obj.senderTime && <div>{`进站时间: ${moment(obj.senderTime).format('YYYY-MM-DD HH:mm')}`}</div>}
                 {!!obj.plateNo && <div>{`车牌号: ${obj.plateNo}`}</div>}