fix

src/components/CAUpload/index.jsx

@@ -28,7 +28,9 @@ class CAUpload extends Component {
 
         this.file = null;
         
-        this.templeteUrl=''
+        this.templeteUrl='';
+
+        this.label='';
     }
     // 模板下载
     jumpTo() {
@@ -126,9 +128,11 @@ class CAUpload extends Component {
 
 
     handleMenuClick(e){
-        // console.log('菜单点击',e);
+        console.log('菜单点击',e);
         const {key} = e;
+        this.label = ''
         this.templeteUrl = key;
+        this.jumpTo();
     }
 
     handleButtonClick(e){
@@ -179,7 +183,7 @@ class CAUpload extends Component {
     render() {
         const uploadProps = this.uploadProps;
         const { type,templateHrefs } = this.props;
-        console.log({...this.props});
+        // console.log({...this.props});
         if (type == 'normal') {
             return [
                 // <Button style={{marginLeft: 10}} key='exportExcel' onClick={this.exportExcel}>导出</Button>,

src/pages/costAccounting/afterCollectionSearch/index.jsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-07-26 10:13:13
- * @LastEditTime: 2021-08-12 21:09:11
+ * @LastEditTime: 2021-08-13 15:47:16
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /TracerMethodology_PC/src/pages/UserMana/index.js
@@ -36,9 +36,9 @@ const AfterCollectionSearch = () => {
   const columns = [
     {
       title: '选择时间',
-      key: 'date',
+      key: 'dateTime',
       hideInTable: true,
-      dataIndex: 'date',
+      dataIndex: 'dateTime',
       renderFormItem: (item, { type, defaultRender, formItemProps, fieldProps, ...rest }, form) => {
 
         if (type === 'form') {
@@ -46,7 +46,7 @@ const AfterCollectionSearch = () => {
         }
         return (
           <Form.Item >
-            <ProFormDatePicker initialValue={currentTime} fieldProps={{ picker: 'month', format: (value) => { return value.format('YYYY-MM') }, locale: locale,onChange:(moment)=>{setCurrentTime(moment.format('YYYYMM'))} }} name="date" />
+            <ProFormDatePicker initialValue={currentTime} fieldProps={{ picker: 'month', format: (value) => { return value.format('YYYY-MM') }, locale: locale,onChange:(moment)=>{setCurrentTime(moment.format('YYYYMM'))} }} name="dateTime" />
           </Form.Item>
         )
       },
@@ -167,14 +167,14 @@ const AfterCollectionSearch = () => {
     },
     {
       title: '成本项目编码',
-      dataIndex: 'projectCode',
-      key: 'projectCode',
+      dataIndex: 'productCode',
+      key: 'productCode',
       hideInSearch: true,
     },
     {
       title: '成本项目名',
-      dataIndex: 'projectName',
-      key: 'projectName',
+      dataIndex: 'productName',
+      key: 'productName',
       hideInSearch: true,
     },
     {
@@ -197,8 +197,8 @@ const AfterCollectionSearch = () => {
   //获取列表
   const getList = async (params = {}, sort, filter) => {
     const { dateTime } = params;
-    // console.log(moment(dateTime).format('YYYY-MM'));
-    const res = await getAfterIncomeCollectionList({ ...params, date: moment(date).format('YYYYMM') });
+    console.log(moment(dateTime).format('yyyyMM'));
+    const res = await getAfterIncomeCollectionList({ ...params, date: moment(dateTime).format('yyyyMM') });
     if (res && res.status) {
       const { data: { totalAmount } } = res;
       setTotalCount(totalAmount);

src/pages/costAccounting/beforeCollectionSearch/index.jsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-07-26 10:13:13
- * @LastEditTime: 2021-08-13 09:18:57
+ * @LastEditTime: 2021-08-13 15:39:41
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /TracerMethodology_PC/src/pages/UserMana/index.js
@@ -77,9 +77,9 @@ const IncomeCostDataImport = () => {
     },
     {
       title: '成本项目',
-      key: 'accountCode',
+      key: 'productCode',
       hideInTable: true,
-      dataIndex: 'accountCode',
+      dataIndex: 'productCode',
       renderFormItem: (item, { type, defaultRender,formItemProps, fieldProps, ...rest }, form) => {
         // console.log({item,type, defaultRender,formItemProps, fieldProps,rest,form })
         if (type === 'form') {
@@ -87,10 +87,10 @@ const IncomeCostDataImport = () => {
         }
 
         return (
-          <Form.Item name="accountCode">
+          <Form.Item name="productCode">
               <ProFormSelect
                 request={async ()=>{
-                     const resp = await getCostProjecttList({pageSize:100});
+                     const resp = await getCostProjecttList({pageSize:500});
                      const {status,data:{list}} = resp;
                      if(status==200){
                       console.log({resp,list});
@@ -103,7 +103,7 @@ const IncomeCostDataImport = () => {
                      }
                 }}
                 width="md"
-                name="accountCode"
+                name="productCode"
               />
           </Form.Item>
         )

src/pages/costAccounting/incomeCostDataImport/index.jsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-07-26 10:13:13
- * @LastEditTime: 2021-08-12 18:58:41
+ * @LastEditTime: 2021-08-13 15:09:58
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /TracerMethodology_PC/src/pages/UserMana/index.js
@@ -41,6 +41,12 @@ const IncomeCostDataImport = () => {
       dataIndex: 'fileName',
       key: 'fileName',
     },
+    {
+      title: '所属年月',
+      dataIndex: 'dateTime',
+      key: 'dateTime',
+      hideInSearch: true,
+    },
     {
       title: '导入时间',
       dataIndex: 'dateTime',
@@ -85,6 +91,7 @@ const IncomeCostDataImport = () => {
           return [
             <Button
               key="config"
+              danger={errStatus==1?true:false}
               onClick={() => {
                 optionBtnGrouphandle(errStatus,record)
               }}

src/pages/responsibilityCenter/index.jsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-07-26 10:13:13
- * @LastEditTime: 2021-08-04 19:08:59
+ * @LastEditTime: 2021-08-13 14:31:32
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /TracerMethodology_PC/src/pages/UserMana/index.js
@@ -334,7 +334,7 @@ const responsibilityCenter = () => {
                 }
           }}
           width="sm"
-          name={['shareLevel']}
+          name='shareLevel'
           label="选择分摊级别"
         />
       </ModalForm>

src/pages/responsibilityCenter/updateForm.jsx

@@ -144,7 +144,7 @@ const UpdateForm = (props) => {
               }
             }}
             width="sm"
-            name='responsibilityLevel'
+            name='shareLevel'
             label="选择分摊级别"
           />
         </ModalForm>