Commit ffa3b33ef26807ecbe89882d5ed61365725cb217
1 parent
b559aad7
feat: update 销售只查看自己的订单
Showing
3 changed files
with
32 additions
and
1 deletions
src/pages/Order/components/OrderDrawer.tsx
@@ -383,6 +383,9 @@ export default ({ onClose, data, subOrders, orderOptType }) => { | @@ -383,6 +383,9 @@ export default ({ onClose, data, subOrders, orderOptType }) => { | ||
383 | currentData.quantity = undefined; | 383 | currentData.quantity = undefined; |
384 | currentData.notes = undefined; | 384 | currentData.notes = undefined; |
385 | currentData.productPrice = undefined; | 385 | currentData.productPrice = undefined; |
386 | + | ||
387 | + currentData.unitId = undefined; | ||
388 | + currentData.materialId = undefined; | ||
386 | form.setFieldValue('list', copyList); | 389 | form.setFieldValue('list', copyList); |
387 | 390 | ||
388 | //todo 查询计量单价列表 | 391 | //todo 查询计量单价列表 |
@@ -1239,7 +1242,10 @@ export default ({ onClose, data, subOrders, orderOptType }) => { | @@ -1239,7 +1242,10 @@ export default ({ onClose, data, subOrders, orderOptType }) => { | ||
1239 | name="unit" | 1242 | name="unit" |
1240 | label="商品单位" | 1243 | label="商品单位" |
1241 | placeholder="请输入商品单位" | 1244 | placeholder="请输入商品单位" |
1242 | - disabled={optType('after-sales-check')} | 1245 | + disabled={ |
1246 | + productParametersDisabledFlagList[listMeta.index] !== | ||
1247 | + false || optType('after-sales-check') | ||
1248 | + } | ||
1243 | rules={[{ required: true, message: '商品单位必填' }]} | 1249 | rules={[{ required: true, message: '商品单位必填' }]} |
1244 | />, | 1250 | />, |
1245 | 1251 |
src/pages/Order/constant.ts
@@ -472,6 +472,13 @@ export const MAIN_ORDER_COLUMNS = [ | @@ -472,6 +472,13 @@ export const MAIN_ORDER_COLUMNS = [ | ||
472 | valueEnum: enumToProTableEnumValue(PRODUCT_BELONG_DEPARTMENT_OPTIONS), | 472 | valueEnum: enumToProTableEnumValue(PRODUCT_BELONG_DEPARTMENT_OPTIONS), |
473 | }, | 473 | }, |
474 | { | 474 | { |
475 | + title: '所属部门', | ||
476 | + dataIndex: 'productBelongBusiness', | ||
477 | + valueType: 'select', | ||
478 | + hideInTable: true, | ||
479 | + valueEnum: enumToProTableEnumValue(PRODUCT_BELONG_DEPARTMENT_OPTIONS), | ||
480 | + }, | ||
481 | + { | ||
475 | title: '创建日期', | 482 | title: '创建日期', |
476 | dataIndex: 'createTime', | 483 | dataIndex: 'createTime', |
477 | valueType: 'dateTimeRange', | 484 | valueType: 'dateTimeRange', |
src/pages/Order/index.tsx
@@ -148,6 +148,8 @@ const OrderPage = () => { | @@ -148,6 +148,8 @@ const OrderPage = () => { | ||
148 | const [mainOrderSelectedRows, setMainOrderSelectedRows] = useState([]); //选中的主订单集合 | 148 | const [mainOrderSelectedRows, setMainOrderSelectedRows] = useState([]); //选中的主订单集合 |
149 | const [onlyShowFinancialToBeProcessed, setOnlyShowFinancialToBeProcessed] = | 149 | const [onlyShowFinancialToBeProcessed, setOnlyShowFinancialToBeProcessed] = |
150 | useState(false); | 150 | useState(false); |
151 | + const [onlyShowSalesCreateProcessed, setOnlyShowSalesCreateProcessed] = | ||
152 | + useState(false); | ||
151 | const mainTableRef = useRef<ActionType>(); | 153 | const mainTableRef = useRef<ActionType>(); |
152 | const mainTableFormRef = useRef<ProFormInstance>(); | 154 | const mainTableFormRef = useRef<ProFormInstance>(); |
153 | let [searchParams, setSearchParam] = useState(Object); //表格的查询条件存储 | 155 | let [searchParams, setSearchParam] = useState(Object); //表格的查询条件存储 |
@@ -200,6 +202,11 @@ const OrderPage = () => { | @@ -200,6 +202,11 @@ const OrderPage = () => { | ||
200 | refreshTable(); | 202 | refreshTable(); |
201 | } | 203 | } |
202 | 204 | ||
205 | + function changeSalesCreateProcessed(e: any) { | ||
206 | + setOnlyShowSalesCreateProcessed(e.target.checked); | ||
207 | + refreshTable(); | ||
208 | + } | ||
209 | + | ||
203 | /** | 210 | /** |
204 | * 复制订单到剪贴板 | 211 | * 复制订单到剪贴板 |
205 | * @param record | 212 | * @param record |
@@ -2237,6 +2244,12 @@ const OrderPage = () => { | @@ -2237,6 +2244,12 @@ const OrderPage = () => { | ||
2237 | ); | 2244 | ); |
2238 | } | 2245 | } |
2239 | 2246 | ||
2247 | + if (roleCode === 'salesRepresentative') { | ||
2248 | + toolBtns.push( | ||
2249 | + <Checkbox onChange={changeSalesCreateProcessed}>只看我创建</Checkbox>, | ||
2250 | + ); | ||
2251 | + } | ||
2252 | + | ||
2240 | if (roleCode === 'admin') { | 2253 | if (roleCode === 'admin') { |
2241 | toolBtns.push( | 2254 | toolBtns.push( |
2242 | <Checkbox onChange={changeProcureToBeProcessed}> | 2255 | <Checkbox onChange={changeProcureToBeProcessed}> |
@@ -2540,6 +2553,11 @@ const OrderPage = () => { | @@ -2540,6 +2553,11 @@ const OrderPage = () => { | ||
2540 | params.condition = 20; | 2553 | params.condition = 20; |
2541 | } | 2554 | } |
2542 | 2555 | ||
2556 | + //销售只查看自己创建的订单 | ||
2557 | + if (onlyShowSalesCreateProcessed) { | ||
2558 | + params.condition = 30; | ||
2559 | + } | ||
2560 | + | ||
2543 | //是否只查看已作废 | 2561 | //是否只查看已作废 |
2544 | params.isDeleteQueryOrder = onlyShowCancelOrder; | 2562 | params.isDeleteQueryOrder = onlyShowCancelOrder; |
2545 | //保存这个搜索条件 | 2563 | //保存这个搜索条件 |