Merge remote-tracking branch 'websoft/master'

src/option/business/project-apply.js

@@ -21,18 +21,6 @@ const amountRules = label => [
   nonNegativeRule(label),
 ];
 
-const userDicFormatter = res => {
-  const list = Array.isArray(res)
-    ? res
-    : Array.isArray(res.data)
-    ? res.data
-    : res.data?.records || [];
-  return list.map(user => ({
-    ...user,
-    realName: user.realName || user.name || user.account,
-  }));
-};
-
 const formatUserRealName = (row, role) =>
   row[`${role}RealName`] ||
   row[`${role}UserRealName`] ||
@@ -103,11 +91,11 @@ export const config = {
 
 export const option = createCrudOption([
   {
-    label: '立项申请单号',
+    label: '申请单号',
     prop: 'applyNo',
     search: true,
     searchPlaceholder: '请输入',
-    searchOrder: 7,
+    searchOrder: 10,
     minWidth: 220,
     addDisplay: false,
     editDisabled: true,
@@ -115,6 +103,9 @@ export const option = createCrudOption([
   {
     label: '项目编号',
     prop: 'projectCode',
+    search: true,
+    searchPlaceholder: '请输入',
+    searchOrder: 5,
     minWidth: 150,
     addDisplay: false,
     editDisabled: true,
@@ -124,7 +115,7 @@ export const option = createCrudOption([
     prop: 'projectName',
     search: true,
     searchPlaceholder: '请输入',
-    searchOrder: 6,
+    searchOrder: 9,
     minWidth: 180,
     maxlength: 50,
     rules: textRule('项目名称', 50, true),
@@ -151,12 +142,18 @@ export const option = createCrudOption([
   {
     label: '客户名称',
     prop: 'customerNames',
+    search: true,
+    searchPlaceholder: '请输入',
+    searchOrder: 6,
     minWidth: 180,
     rules: textRule('客户名称', 255, true),
   },
   {
     label: '下游承运商',
     prop: 'carrierNames',
+    search: true,
+    searchPlaceholder: '请输入',
+    searchOrder: 7,
     minWidth: 180,
     rules: textRule('下游承运商', 255, true),
   },
@@ -172,7 +169,7 @@ export const option = createCrudOption([
     prop: 'undertakeDeptName',
     search: true,
     searchPlaceholder: '请输入',
-    searchOrder: 5,
+    searchOrder: 8,
     minWidth: 150,
     rules: textRule('承办部门', 50, true),
   },
@@ -184,26 +181,17 @@ export const option = createCrudOption([
   {
     label: '项目负责人',
     prop: 'principalUserName',
+    search: true,
+    searchPlaceholder: '请输入',
+    searchOrder: 4,
     minWidth: 130,
     formatter: row => formatUserRealName(row, 'principal'),
     rules: textRule('项目负责人', 50, true),
   },
   {
-    label: '项目负责人',
+    label: '项目负责人ID',
     prop: 'principalUserId',
-    type: 'select',
-    search: true,
-    searchPlaceholder: '请选择',
-    searchOrder: 4,
-    filterable: true,
-    dicUrl: '/blade-system/user/user-list',
-    dicFormatter: userDicFormatter,
-    props: {
-      label: 'realName',
-      value: 'id',
-    },
     hide: true,
-    display: false,
   },
   {
     label: '项目经办人',