feat: update工单管理

PurelzMgnead
1 parent 48b5692b
Showing 5 changed files with 43 additions and 19 deletions
.umirc.ts
src/pages/Tickets/components/readModal.tsx
src/pages/Tickets/components/solveBtnModal.tsx
src/pages/Tickets/components/solveModal.tsx
src/pages/Tickets/index.tsx
@@ -14,9 +14,9 @@ export default defineConfig({
   },
   proxy: {
     '/api/': {
-      // target: 'http://localhost:8085/',
+      target: 'http://localhost:8085/',
       // target: 'http://192.168.1.6:8085/',
-      target: 'http://39.108.227.113:8085/',
+      // target: 'http://39.108.227.113:8085/',
       changeOrigin: true,
       pathRewrite: { '^/api': '' },
     },
@@ -191,7 +191,6 @@ export default defineConfig({
       path: '/tickets',
       component: './Tickets',
       icon: 'BookOutlined',
-      access: 'canReadAdminAndWarehouseKeeperAndProcure',
     },
   ],
@@ -175,7 +175,11 @@ export default ({ id, toReload }) =&gt; {
             defaultDoms[0],
             <Space key="buttons">
               {!isEditMode && !isProcessing && (
-                <Button type="primary" onClick={() => setIsEditMode(true)}>
+                <Button
+                  type="primary"
+                  onClick={() => setIsEditMode(true)}
+                  disabled={status === 'SOLVED'}
+                >
                   编辑
                 </Button>
               )}
@@ -329,6 +333,35 @@ export default ({ id, toReload }) =&gt; {
                 <span>{status === 'SOLVED' ? '已处理' : '待处理'}</span>
               </Form.Item>
             </ProCard>
+            {status === 'SOLVED' && (
+              <>
+                <ProCard>
+                  <Form.Item label="处理结果">
+                    <ProFormText
+                      name="result"
+                      placeholder="请输入处理结果"
+                      width={200}
+                      readonly
+                    />
+                  </Form.Item>
+                </ProCard>
+                <ProCard>
+                  <Form.Item label="附件">
+                    {form.getFieldValue('resultAnnexUrl') ? (
+                      <a
+                        href={form.getFieldValue('resultAnnexUrl')}
+                        target="_blank"
+                        rel="noopener noreferrer"
+                      >
+                        {form.getFieldValue('resultAnnexName') || '附件'}
+                      </a>
+                    ) : (
+                      <span>无附件</span>
+                    )}
+                  </Form.Item>
+                </ProCard>
+              </>
+            )}
           </ProCard.Group>
         </ProCard>
       </ProCard>
@@ -20,7 +20,7 @@ const waitTime = (time = 100) =&gt; {
   });
 };
-export default ({ id, reload, show, closeMadel, solved }) => {
+export default ({ id, reload, show, solved }) => {
   const [form] = Form.useForm<{ result: string }>();
   const [fileList, setFileList] = useState<file[]>([]);
@@ -72,16 +72,7 @@ export default ({ id, reload, show, closeMadel, solved }) =&gt; {
         title="处理工单"
         width={660}
         form={form}
-        trigger={
-          <Button
-            onClick={() => {
-              closeMadel();
-            }}
-            disabled={show}
-          >
-            处理
-          </Button>
-        }
+        trigger={<Button disabled={show}>处理</Button>}
         modalProps={{
           okText: '确定',
           cancelText: '取消',
@@ -95,8 +86,8 @@ export default ({ id, reload, show, closeMadel, solved }) =&gt; {
             ticketRequest.result = values.result;
           }
           if (fileList.length !== 0) {
-            ticketRequest.annexUrl = fileList[0].url;
-            ticketRequest.annexName = fileList[0].name;
+            ticketRequest.resultAnnexUrl = fileList[0].url;
+            ticketRequest.resultAnnexName = fileList[0].name;
           }
           let res = postOrderErpTicketsUpdate({
             data: {
@@ -86,8 +86,8 @@ export default ({ id, toReload }) =&gt; {
             ticketRequest.result = values.result;
           }
           if (fileList.length !== 0) {
-            ticketRequest.annexUrl = fileList[0].url;
-            ticketRequest.annexName = fileList[0].name;
+            ticketRequest.resultAnnexUrl = fileList[0].url;
+            ticketRequest.resultAnnexName = fileList[0].name;
           }
           let res = postOrderErpTicketsUpdate({
             data: {
@@ -20,6 +20,7 @@ import DeleteButton from &#39;./components/deleteModal&#39;;
 import ReSetPeopleModal from './components/reSetPeopleModal';
 import ReadModal from './components/readModal';
 import SolveModal from './components/solveModal';
+import './index.less';
 const TicketsPage = () => {
   const [assignPeopleOptions, setAssignPeopleOptions] = useState([]);