11

src/components/DrawerPro/index.jsx

@@ -5,6 +5,7 @@ import DetailPro from '../DetailPro';
 import PropTypes from 'prop-types';
 
 function DrawerPro(props) {
+  let pushSettingFlag = props.pushSettingFlag;
   let newProps = { ...props };
   delete newProps.children;
   const detailprops = {
@@ -30,6 +31,16 @@ function DrawerPro(props) {
       ) : (
         <InitForm {...newProps} />
       )}
+      {pushSettingFlag ? (
+        <a
+          id="pushSettingBtn"
+          onClick={() => {
+            props.checkVariableOpen();
+          }}
+        >
+          查看变量
+        </a>
+      ) : null}
     </Drawer>
   );
 }

src/global.less

@@ -485,4 +485,11 @@ ol {
   aside {
     z-index: 998;
   }
+}
+
+#pushSettingBtn {
+  position: relative;
+  top: -162px;
+  left: 74px;
+  color: #1890ff;
 }
\ No newline at end of file

src/pages/system/pushsetting/columns.js

 function getcolumns(setdrawer) {
-      return {
- "columns": [
-  {
-   "title": "推送场景",
-   "dataIndex": "businessMsgSceneId",
-   "key": "businessMsgSceneId"
-  },
-  {
-   "title": "推送方式",
-   "dataIndex": "sendMethodType",
-   "key": "sendMethodType"
-  },
-  {
-   "title": "适用类型",
-   "dataIndex": "fitField",
-   "key": "fitField",
-   "valueType": "select",
-   "mode": "radio",
-   "options": [
-    {
-     "label": "全部",
-     "value": "1"
+  return {
+    columns: [
+      {
+        title: '推送场景',
+        dataIndex: 'msgSceneName',
+        key: 'businessMsgSceneId',
+        valueType: 'select',
+        options: {
+          path: '/base/paBusinessMsgScene/queryAllForSelect',
+          params: {},
+        },
+      },
+      {
+        title: '推送方式',
+        dataIndex: 'sendMethodName',
+        key: 'sendMethodType',
+        valueType: 'select',
+        options: [
+          {
+            value: '4',
+            label: '邮件',
+          },
+        ],
+      },
+      {
+        title: '适用类型',
+        dataIndex: 'fitFieldName',
+        key: 'fitField',
+        valueType: 'select',
+        mode: 'radio',
+        options: [
+          {
+            label: '全部',
+            value: '1',
+          },
+          {
+            label: '公司',
+            value: '2',
+          },
+          {
+            label: '部门',
+            value: '3',
+          },
+          {
+            label: '工厂',
+            value: '4',
+          },
+          {
+            label: '车间',
+            value: '5',
+          },
+          {
+            label: '工段',
+            value: '6',
+          },
+          {
+            label: '产线',
+            value: '7',
+          },
+        ],
+      },
+      {
+        title: '类型名称',
+        dataIndex: 'fieldName',
+        key: 'fieldId',
+      },
+      {
+        title: '推送内容',
+        dataIndex: 'sendContent',
+        key: 'sendContent',
+        valueType: 'textarea',
+      },
+    ],
+    pathconfig: {
+      enableadd: true,
+      enableedit: true,
+      enabledelete: true,
+      enabledetail: true,
+      add: '',
+      edit: '',
+      list: '/base/paBusinessMsgOption/queryList',
+      delete: '/base/paBusinessMsgOption/deleteById',
+      detail: '',
     },
-    {
-     "label": "公司",
-     "value": "2"
-    },
-    {
-     "label": "部门",
-     "value": "3"
-    },
-    {
-     "label": "工厂",
-     "value": "4"
-    },
-    {
-     "label": "车间",
-     "value": "5"
-    },
-    {
-     "label": "工段",
-     "value": "6"
-    },
-    {
-     "label": "产线",
-     "value": "7"
-    }
-   ]
-  },
-  {
-   "title": "适用选择",
-   "dataIndex": "fieldId",
-   "key": "fieldId"
-  },
-  {
-   "title": "推送标题",
-   "dataIndex": "sendTitle",
-   "key": "sendTitle"
-  },
-  {
-   "title": "推送内容",
-   "dataIndex": "sendContent",
-   "key": "sendContent"
-  }
- ],
- "pathconfig": {
-  "enableadd": false,
-  "enableedit": false,
-  "enabledelete": false,
-  "enabledetail": false,
-  "add": "",
-  "edit": "",
-  "list": "/repair/umRepairOrder/queryRepairOrderList",
-  "delete": "",
-  "detail": ""
- }
-};
-    }
-    export default getcolumns;
-    
+  };
+}
+export default getcolumns;
\ No newline at end of file