f

src/pages/custom/index.jsx

@@ -25,40 +25,48 @@ export default (props) => {
     {
       title: "公司",
       dataIndex: "customName",
+      ellipsis: true,
       search: false,
     },
     {
       title: "税号",
       dataIndex: "dutyParagraph",
+      ellipsis: true,
       search: false,
     },
     {
       title: "开户行",
       search: false,
       dataIndex: "openingBank",
+      ellipsis: true,
     },
     {
       title: "账号",
       dataIndex: "account",
       search: false,
+      ellipsis: true,
     },
     {
       title: "联系人姓名",
       dataIndex: "contactsName",
+      ellipsis: true,
     },
     {
       title: "联系人头衔",
       dataIndex: "contactsTitle",
       search: false,
+      ellipsis: true,
     },
     {
       title: "联系人手机",
       dataIndex: "contactsPhone",
+      ellipsis: true,
     },
     {
       title: "联系人邮箱",
       dataIndex: "contactsEmail",
       search: false,
+      ellipsis: true,
     },
     {
       title: "操作",
@@ -94,6 +102,7 @@ export default (props) => {
     <Page>
       <ProTable
         actionRef={actionRef}
+        // scroll={{ x: 1900 }}
         rowKey="customId"
         toolBarRender={() => [
           <Button

src/pages/project/Edit.jsx

@@ -36,7 +36,7 @@ export default (props) => {
       })
     }
     getTaCustom().then((res) => {
-      setList(res.records);
+      setList(res.records?.map(x => ({ label: x.customName, value: x.customId })) || []);
     })
   }, [id])
 
@@ -110,21 +110,25 @@ export default (props) => {
           </Form.Item>
 
           <Form.Item name="customId" label="所属客户">
-            <Select placeholder="请选择">
-              {
+            <Select placeholder="请选择" options={list} />
+            {/* {
                 list.map((res, index) => {
                   return (
                     <Option key={index} value={res.customId}>{res.customName}</Option>
                   )
                 })
               }
-            </Select>
+            </Select> */}
           </Form.Item>
           <Form.Item name="quotation" label="合同报价">
             <Input placeholder="请输入" />
           </Form.Item>
           <Form.Item name="stage" label="目前阶段">
-            <Input placeholder="请输入" />
+            <Select>
+              <Select.Option value={0}>未开始</Select.Option>
+              <Select.Option value={1}>处理中</Select.Option>
+              <Select.Option value={2}>以完成</Select.Option>
+            </Select>
           </Form.Item>
           <Form.Item name="contactsName" label="联系人姓名">
             <Input placeholder="请输入" />

src/pages/project/index.jsx

@@ -16,11 +16,13 @@ export default (props) => {
     {
       title: "项目名称",
       dataIndex: "projectName",
+      ellipsis: true,
     },
     {
       title: "简介",
       dataIndex: "introduction",
       search: false,
+      ellipsis: true,
     },
     {
       title: "开始日期",
@@ -36,85 +38,106 @@ export default (props) => {
       title: "运维服务期",
       dataIndex: "crm",
       search: false,
+      ellipsis: true,
     },
     {
       title: "所属客户",
       dataIndex: "customId",
       valueType: "select",
       search: false,
-      request: TaCustom
+      request: TaCustom,
+      ellipsis: true,
     },
     {
       title: "合同报价",
       dataIndex: "quotation",
       search: false,
+      ellipsis: true,
     },
     {
       title: "目前阶段",
       dataIndex: "stage",
       search: false,
+      valueType: "select",
+      valueEnum: {
+        0: "未开始",
+        1: "处理中",
+        2: "以完成",
+      }
     },
     {
       title: "联系人姓名",
       dataIndex: "contactsName",
+      ellipsis: true,
     },
     {
       title: "联系人头衔",
       dataIndex: "contactsTitle",
       search: false,
+      ellipsis: true,
     },
 
     {
       title: "联系人手机",
       dataIndex: "contactsPhone",
       search: false,
+      ellipsis: true,
     },
     {
       title: "联系人邮箱",
       dataIndex: "contactsEmail",
       search: false,
+      ellipsis: true,
     },
     {
       title: "负责人",
       dataIndex: "headPerson",
+      ellipsis: true,
     },
     {
       title: "服务运营商",
       dataIndex: "serviceIsp",
       search: false,
+      ellipsis: true,
     },
 
     {
       title: "主机",
       dataIndex: "hostMachine",
       search: false,
+      ellipsis: true,
     },
     {
       title: "数据库",
       dataIndex: "dataBase",
       search: false,
+      ellipsis: true,
     },
     {
       title: "OSS",
       dataIndex: "oss",
       search: false,
+      ellipsis: true,
     },
     {
       title: "前端地址",
       dataIndex: "webUrl",
       search: false,
+      ellipsis: true,
     },
 
     {
       title: "账户",
       dataIndex: "account",
       search: false,
+      ellipsis: true,
     },
     {
       title: "密码",
       dataIndex: "password",
       render: (_, row) => row?.password.replace(row.password, '******'),
       search: false,
+      ellipsis: true,
     },
   ];
 

src/pages/user/Edit.jsx

@@ -76,6 +76,24 @@ export default (props) => {
             <Input placeholder="请输入电话" />
           </Form.Item>
 
+          <Form.Item
+            label="账户"
+            name="account"
+            rules={[{ required: true, message: "请输入账户" }]}
+          >
+            <Input placeholder="请输入账户" style={{ borderRadius: "4px" }} />
+          </Form.Item>
+          <Form.Item
+            label="密码"
+            name="password"
+            rules={[{ required: true, message: "请输入密码" }]}
+          >
+            <Input.Password
+              placeholder="请输入密码"
+              style={{ borderRadius: "4px" }}
+            />
+          </Form.Item>
+
           <Form.Item {...tailFormItemLayout}>
             <Button loading={submiting} type="primary" htmlType="submit">
               保存

src/pages/user/index.jsx

@@ -22,10 +22,25 @@ export default (props) => {
     {
       title: "姓名",
       dataIndex: "userName",
+      ellipsis: true,
     },
     {
       title: "电话",
       dataIndex: "phone",
+      ellipsis: true,
+    },
+    {
+      title: "账户",
+      dataIndex: "account",
+      ellipsis: true,
+      search: false,
+    },
+    {
+      title: "密码",
+      dataIndex: "password",
+      ellipsis: true,
+      search: false,
+      render: (_, row) => row?.password.replace(row.password, '******'),
     },
     {
       title: "操作",

src/utils/request.js

@@ -103,7 +103,7 @@ instance.interceptors.response.use(
 
 export default instance;
 
-export function queryTable(apiRequest) {
+export function queryTable (apiRequest) {
   return function (params) {
     const { pageSize } = params;
     return apiRequest({
@@ -126,9 +126,15 @@ export function queryTable(apiRequest) {
   };
 }
 
-export function queryDict(
+function getValueOfType (value, type) {
+  if (type == 'string') return `${value}`
+  if (type == 'int' || type == 'integer') return value - 0;
+  return value;
+}
+
+export function queryDict (
   apiRequest,
-  { labelKey = "name", valueKey = "id" } = {}
+  { labelKey = "name", valueKey = "id", valueType }
 ) {
   return function (params) {
     const { current, pageSize, ...leftParams } = params || {};
@@ -140,7 +146,7 @@ export function queryDict(
       .then((res) => {
         return res?.records?.map((x) => ({
           label: x[labelKey],
-          value: x[valueKey],
+          value: getValueOfType(x[valueKey], valueType),
           ...x,
         }));
       })
@@ -151,7 +157,7 @@ export function queryDict(
       });
   };
 }
-export function restful(url) {
+export function restful (url) {
   const list = (params) => instance.get(url, { params });
   const get = (id) => instance.get(`${url}/${id}`);
   const add = (data) => instance.post(url, data);
@@ -161,7 +167,7 @@ export function restful(url) {
   return [list, get, add, update, del];
 }
 
-export function useRequest(fn) {
+export function useRequest (fn) {
   const [loading, setLoading] = React.useState(false);
 
   const p = (...args) =>
@@ -181,7 +187,7 @@ export function useRequest(fn) {
   return [loading, p];
 }
 
-function downloadBlob(response) {
+function downloadBlob (response) {
   let fileName = "未知文件";
   const contentType = response.headers["content-type"];
   const contentDisposition = response.headers["content-disposition"];

vite.config.js

@@ -11,7 +11,7 @@ export default defineConfig({
     host: "0.0.0.0",
     proxy: {
       '/api': {
-        target: 'http://127.0.0.1:8090',
+        target: 'http://192.168.89.25:8090',
         changeOrigin: true,
       },
       // '/': 'http://192.168.89.25:8090',