Browse Source

开发上海用户权限

dev01 6 days ago
parent
commit
a75f306cfd

+ 1 - 1
js/component/common/ApproveTypeTooltip/index.js

@@ -12,7 +12,7 @@ export default function ApproveTypeTooltip() {
       </div>
       <div className="mandatory">
         <Checkbox checked disabled>
-          <span style={{ color: 'red' }}>本人已知以上内容,并承诺自愿按照以上约定执行。</span>
+          <span style={{ color: 'red' }}>本人已知以上内容,并承诺自愿按照以上约定执行。</span>
         </Checkbox>
       </div>
     </div>

+ 3 - 3
js/component/manageCenter/customer/NEW/intentionCustomer/intentionCustomer.jsx

@@ -37,7 +37,7 @@ const IntentionCustomer = Form.create()(
   React.createClass({
     loadData(pageNo, apiUrl) {
       // 新需求 除湖南和内蒙古外 不让其他省操作
-      if (adminData.province != "21" && adminData.province != "11") {
+      if (adminData.province != "21" && adminData.province != "11" && adminData.province != "2") {
         return
       }
       this.setState({
@@ -1124,7 +1124,7 @@ const IntentionCustomer = Form.create()(
               <TabPane tab="搜索" key="1">
                 {
                   // 新需求 除湖南和内蒙古外 不让其他省操作
-                  (adminData.province == "21" || adminData.province == "11") &&
+                  (adminData.province == "21" || adminData.province == "11" || adminData.province == "2") &&
                   <Button
                     type="primary"
                     style={{
@@ -1288,7 +1288,7 @@ const IntentionCustomer = Form.create()(
                 </Button>
                 {
                   // 新需求 除湖南和内蒙古外 不让其他省操作
-                  (adminData.province == "21" || adminData.province == "11") &&
+                  (adminData.province == "21" || adminData.province == "11" || adminData.province == "2") &&
                   <Button
                     type="primary"
                     style={{

+ 1 - 1
js/component/manageCenter/customer/NEW/publicCustomer/publicCustomer.jsx

@@ -19,7 +19,7 @@ import ImgList from '../../../../common/imgList/index.js';
 const QueryCustomer = React.createClass({
   loadData(pageNo, apiUrl) {
     // 新需求 除湖南和内蒙古外 不让其他省操作
-    if (adminData.province != "21" && adminData.province != "11") {
+    if (adminData.province != "21" && adminData.province != "11" || adminData.province != "2") {
       return
     }
     this.setState({

+ 1 - 1
js/component/manageCenter/customer/NEW/query/queryCutomer.jsx

@@ -24,7 +24,7 @@ const QueryCustomer = React.createClass({
       return
     }
     // 新需求 除湖南和内蒙古外 不让其他省操作
-    if (adminData.province != "21" && adminData.province != "11") {
+    if (adminData.province != "21" && adminData.province != "11" && adminData.province != "2") {
       return
     }
     this.setState({

+ 2 - 2
js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx

@@ -1022,10 +1022,10 @@ const OrderDetail = Form.create()(
                     {getApprovedType(this.state.type ? this.state.type.split(",").map(Number) : [], this.state.typeExplain, 1)}
                   </span>
                 </FormItem>
-                { this.state.approval == 1 && <div className="clearfix">
+                { this.state.approval > 0 && <div className="clearfix">
                   <FormItem
                     labelCol={{ span: 5 }}
-                    wrapperCol={{ span: 16 }}
+                    wrapperCol={{ span: 19 }}
                     label={
                       <span className="mandatory" style={{fontSize: '12px'}}>
                         提示

+ 11 - 10
js/component/manageCenter/order/orderNew/addService.jsx

@@ -6662,8 +6662,8 @@ const NewService = Form.create()(
                               {this.state.processStatus === 0 ? (
                                 <div className="clearfix">
                                   <FormItem
-                                    className="half-item"
-                                    {...formItemLayout}
+                                    labelCol={{ span: 5 }}
+                                    wrapperCol={{ span: 19 }}
                                     label="特批立项"
                                   >
                                     <Select
@@ -6694,10 +6694,10 @@ const NewService = Form.create()(
                                     }
                                   </FormItem>
 
-                                  { this.state.approval == 1 && <div className="clearfix">
+                                  { this.state.approval > 0 && <div className="clearfix">
                                       <FormItem
                                         labelCol={{ span: 5 }}
-                                        wrapperCol={{ span: 16 }}
+                                        wrapperCol={{ span: 19 }}
                                         label={
                                           <span className="mandatory" style={{fontSize: '12px'}}>
                                             提示
@@ -6768,8 +6768,8 @@ const NewService = Form.create()(
                               ) : (
                                 <div className="clearfix">
                                   <FormItem
-                                    className="half-item"
-                                    {...formItemLayout}
+                                    labelCol={{ span: 5 }}
+                                    wrapperCol={{ span: 19 }}
                                     label="特批立项"
                                   >
                                     <span>
@@ -6778,10 +6778,11 @@ const NewService = Form.create()(
                                       {getApprovedType(this.state.approvaType, this.state.typeExplain, 1)}
                                     </span>
                                   </FormItem>
-                                  { this.state.approval == 1 && <div className="clearfix">
+                                  { this.state.approval }
+                                  { this.state.approval > 0 && <div className="clearfix">
                                       <FormItem
                                         labelCol={{ span: 5 }}
-                                        wrapperCol={{ span: 16 }}
+                                        wrapperCol={{ span: 19 }}
                                         label={
                                           <span className="mandatory" style={{fontSize: '12px'}}>
                                             提示
@@ -7725,7 +7726,7 @@ const NewService = Form.create()(
                               </span>
                               {
                                 // 新需求 除湖南和内蒙古外 不让其他省操作
-                                (adminData.province == "21" || adminData.province == "11") &&
+                                (adminData.province == "21" || adminData.province == "11" || adminData.province == "2") &&
                                 <div>
                                   {
                                     this.state.processStatus == 0 &&
@@ -8025,7 +8026,7 @@ const NewService = Form.create()(
                       </TabPane>
                       {
                         // 新需求 除湖南和内蒙古外 不让其他省操作
-                        (adminData.province == "21" || adminData.province == "11") &&
+                        (adminData.province == "21" || adminData.province == "11" || adminData.province == "2") &&
                         <TabPane tab="合同变更发起" key="2">
                           {
                             this.state.activeKey == "2" &&

+ 15 - 0
js/component/manageCenter/order/orderNew/approveds.jsx

@@ -54,6 +54,7 @@ import Cascaders from "../../../common/cascaders";
 import FlowChart from '../../../common/flowchart'; // 流程图
 import Gxczx from '../../../common/orderDetail/gxczx' // 高新纯咨询合同说明详情
 import Property from '../../../common/orderDetail/property' // 知识产权情况
+import ApproveTypeTooltip from '../../../common/ApproveTypeTooltip';
 
 const { TabPane } = Tabs;
 const { TextArea } = Input;
@@ -2621,6 +2622,20 @@ const IntentionCustomer = Form.create()(
                         {getApprovedType(this.state.type ? this.state.type.split(",").map(Number) : [], this.state.typeExplain, 1)}
                       </span>
                     </FormItem>
+                    { this.state.approval > 0 && <div className="clearfix">
+                      <FormItem
+                        labelCol={{ span: 5 }}
+                        wrapperCol={{ span: 19 }}
+                        label={
+                          <span className="mandatory" style={{fontSize: '12px'}}>
+                            提示
+                          </span>
+                        }
+                      >
+                        <ApproveTypeTooltip />
+                      </FormItem>
+                    </div>
+                    }
                     <FormItem
                       className="half-item"
                       {...formItemLayout}

+ 3 - 2
js/component/manageCenter/order/orderNew/billing.jsx

@@ -1638,6 +1638,7 @@ const MyService = Form.create()(
       }
     },
     tableRowClick(record) {
+      console.log(record)
       this.state.userDetaile = true;
       this.state.datauser = record;
       this.setState({
@@ -2164,8 +2165,8 @@ const MyService = Form.create()(
                       重置 <Icon type="reload" />
                     </Button>
                     {
-                      // 新需求 除湖南和内蒙古外 不让其他省操作
-                      (adminData.province == "21" || adminData.province == "11") &&
+                      // 新需求 除湖南、内蒙古上海外 不让其他省操作
+                      (adminData.province == "21" || adminData.province == "11" || adminData.province == "2") && 
                       <Button
                         type="primary"
                         onClick={this.addClick}

+ 1 - 1
js/component/manageCenter/order/orderNew/changeComponent/changeApply.js

@@ -2942,7 +2942,7 @@ class ChangeApply extends Component {
         </ul> */}
           {
             // 新需求 除湖南和内蒙古外 不让其他省操作
-            (adminData.province == "21" || adminData.province == "11") &&
+            (adminData.province == "21" || adminData.province == "11" || adminData.province == "2") &&
             <div className="clearfix">
               <Button
                 type="primary"

+ 15 - 0
js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js

@@ -23,6 +23,7 @@ import ContentUrl from "../contentUrl";
 import FlowChart from '../../../../common/flowchart'; // 流程图
 import Gxczx from '../../../../common/orderDetail/gxczx' // 高新纯咨询合同说明详情
 import Property from '../../../../common/orderDetail/property' // 知识产权情况
+import ApproveTypeTooltip from "../../../../common/ApproveTypeTooltip";
 
 
 const FormItem = Form.Item;
@@ -714,6 +715,20 @@ class OrderDetail extends Component {
         <FormItem className="half-item" {...formItemLayout} label="特批立项">
           <span>{getApprovedState(data.approval)}</span>
         </FormItem>
+        { data.approval > 0 && <div className="clearfix">
+          <FormItem
+            labelCol={{ span: 5 }}
+            wrapperCol={{ span: 19 }}
+            label={
+              <span className="mandatory" style={{fontSize: '12px'}}>
+                提示
+              </span>
+            }
+          >
+            <ApproveTypeTooltip />
+          </FormItem>
+        </div>
+        }
         <FormItem
           className="half-item"
           {...formItemLayout}

+ 15 - 0
js/component/manageCenter/order/orderNew/examine.jsx

@@ -49,6 +49,7 @@ import { salesList, processStatus, approvalOptions } from "@/dataDic.js";
 import FlowChart from '../../../common/flowchart'; // 流程图
 import Gxczx from '../../../common/orderDetail/gxczx' // 高新纯咨询合同说明详情
 import Property from '../../../common/orderDetail/property' // 知识产权情况
+import ApproveTypeTooltip from "../../../common/ApproveTypeTooltip";
 
 
 const confirm = Modal.confirm;
@@ -1999,6 +2000,20 @@ const IntentionCustomer = Form.create()(
                               {getApprovedType(this.state.type ? this.state.type.split(",").map(Number) : [], this.state.typeExplain, 1)}
                             </span>
                           </FormItem>
+                          { this.state.approval > 0 && <div className="clearfix">
+                              <FormItem
+                                labelCol={{ span: 4 }}
+                                wrapperCol={{ span: 20 }}
+                                label={
+                                  <span className="mandatory" style={{fontSize: '12px'}}>
+                                    提示
+                                  </span>
+                                }
+                              >
+                                <ApproveTypeTooltip />
+                              </FormItem>
+                            </div>
+                          }
                           <FormItem
                             className="half-item"
                             {...formItemLayout}

+ 15 - 0
js/component/manageCenter/order/orderNew/examinejl.jsx

@@ -50,6 +50,7 @@ import { salesList, processStatus, approvalOptions } from "@/dataDic.js";
 import FlowChart from '../../../common/flowchart'; // 流程图
 import Gxczx from '../../../common/orderDetail/gxczx' // 高新纯咨询合同说明详情
 import Property from '../../../common/orderDetail/property' // 知识产权情况
+import ApproveTypeTooltip from "../../../common/ApproveTypeTooltip";
 
 
 const confirm = Modal.confirm;
@@ -2000,6 +2001,20 @@ const IntentionCustomer = Form.create()(
                               {getApprovedType(this.state.type ? this.state.type.split(",").map(Number) : [], this.state.typeExplain, 1)}
                             </span>
                           </FormItem>
+                          { this.state.approval > 0 && <div className="clearfix">
+                            <FormItem
+                              labelCol={{ span: 5 }}
+                              wrapperCol={{ span: 19 }}
+                              label={
+                                <span className="mandatory" style={{fontSize: '12px'}}>
+                                  提示
+                                </span>
+                              }
+                            >
+                              <ApproveTypeTooltip />
+                            </FormItem>
+                          </div>
+                          }
                           <FormItem
                             className="half-item"
                             {...formItemLayout}

+ 15 - 0
js/component/manageCenter/order/orderNew/examineyybz.jsx

@@ -49,6 +49,7 @@ import { salesList, processStatus, approvalOptions } from "@/dataDic.js";
 import FlowChart from '../../../common/flowchart'; // 流程图
 import Gxczx from '../../../common/orderDetail/gxczx' // 高新纯咨询合同说明详情
 import Property from '../../../common/orderDetail/property' // 知识产权情况
+import ApproveTypeTooltip from "../../../common/ApproveTypeTooltip";
 
 
 const confirm = Modal.confirm;
@@ -1993,6 +1994,20 @@ const IntentionCustomer = Form.create()(
                               {getApprovedType(this.state.type ? this.state.type.split(",").map(Number) : [], this.state.typeExplain, 1)}
                             </span>
                           </FormItem>
+                          { this.state.approval > 0 && <div className="clearfix">
+                              <FormItem
+                                labelCol={{ span: 5 }}
+                                wrapperCol={{ span: 19 }}
+                                label={
+                                  <span className="mandatory" style={{fontSize: '12px'}}>
+                                    提示
+                                  </span>
+                                }
+                              >
+                                <ApproveTypeTooltip />
+                              </FormItem>
+                            </div>
+                          }
                           <FormItem
                             className="half-item"
                             {...formItemLayout}

+ 15 - 0
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -61,6 +61,7 @@ import LogPopup from "../../../common/logPopup";
 import Cascaders from "../../../common/cascaders";
 import NewPicturesWall from "./changeComponent/picturesWall.js";
 import FlowChart from '../../../common/flowchart'; // 流程图
+import ApproveTypeTooltip from "../../../common/ApproveTypeTooltip/index.js";
 
 const { Option } = Select;
 const { TabPane } = Tabs;
@@ -4655,6 +4656,20 @@ const IntentionCustomer = Form.create()(
                       >
                         <span>{getApprovedState(this.state.approval)}</span>
                       </FormItem>
+                       { this.state.approval > 0 && <div className="clearfix">
+                        <FormItem
+                          labelCol={{ span: 4 }}
+                          wrapperCol={{ span: 20 }}
+                          label={
+                            <span className="mandatory" style={{fontSize: '12px'}}>
+                              提示
+                            </span>
+                          }
+                        >
+                          <ApproveTypeTooltip />
+                        </FormItem>
+                        </div>
+                      }
                       <FormItem
                         className="half-item"
                         {...formItemLayout}

+ 1 - 1
js/component/manageCenter/order/orderNew/mysuspend.jsx

@@ -127,7 +127,7 @@ const MySuspendList = React.createClass({
               {getStopStatus(record.stopType, value)}
               {
                 // 新需求 除湖南和内蒙古外 不让其他省操作
-                (adminData.province == "21" || adminData.province == "11") &&
+                (adminData.province == "21" || adminData.province == "11" || adminData.province == "2") &&
                 <div>
                   {
                     record.stopType == 0 && record.stopStatus == 1 &&

+ 5 - 5
js/component/manageCenter/order/orderNew/reject.jsx

@@ -2558,8 +2558,8 @@ const IntentionCustomer = Form.create()(
                     </FormItem>
                     <div className="clearfix">
                       <FormItem
-                        className="half-item"
-                        {...formItemLayout}
+                        labelCol={{ span: 5 }}
+                        wrapperCol={{ span: 19 }}
                         label="特批立项"
                       >
                         <Select
@@ -2598,10 +2598,10 @@ const IntentionCustomer = Form.create()(
                       </FormItem>
                     </div>
 
-                    { this.state.approval == 1 && <div className="clearfix">
+                    { this.state.approval > 0 && <div className="clearfix">
                       <FormItem
                         labelCol={{ span: 5 }}
-                        wrapperCol={{ span: 16 }}
+                        wrapperCol={{ span: 19 }}
                         label={
                           <span className="mandatory" style={{fontSize: '12px'}}>
                             提示
@@ -3023,7 +3023,7 @@ const IntentionCustomer = Form.create()(
                     <div className="addSave" style={{ display: "flex", justifyContent: "center" }}>
                       {
                         // 新需求 除湖南和内蒙古外 不让其他省操作
-                        (adminData.province == "21" || adminData.province == "11") &&
+                        (adminData.province == "21" || adminData.province == "11" || adminData.province == "2") &&
                         <Button
                           className="cancel"
                           type="primary"

+ 15 - 0
js/component/manageCenter/project/project/projectAssignment.jsx

@@ -46,6 +46,7 @@ import Cascaders from "../../../common/cascaders";
 import FlowChart from '../../../common/flowchart'; // 流程图
 import Gxczx from '../../../common/orderDetail/gxczx' // 高新纯咨询合同说明详情
 import Property from '../../../common/orderDetail/property' // 知识产权情况
+import ApproveTypeTooltip from "../../../common/ApproveTypeTooltip/index.js";
 
 
 const { TabPane } = Tabs
@@ -1687,6 +1688,20 @@ const PaiDan = React.createClass({
                       {getApprovedType(this.state.type ? this.state.type.split(",").map(Number) : [], this.state.typeExplain, 1)}
                     </span>
                   </FormItem>
+                  { this.state.approval > 0 && <div className="clearfix">
+                      <FormItem
+                        labelCol={{ span: 5 }}
+                        wrapperCol={{ span: 19 }}
+                        label={
+                          <span className="mandatory" style={{fontSize: '12px'}}>
+                            提示
+                          </span>
+                        }
+                      >
+                        <ApproveTypeTooltip />
+                      </FormItem>
+                    </div>
+                  }
                   <FormItem
                     className="half-item"
                     {...formItemLayout}

+ 15 - 0
js/component/manageCenter/project/task/myTask.jsx

@@ -66,6 +66,7 @@ import PaymentRecord from "../../../common/initiateOrder/paymentRecord";
 import Cascaders from "../../../common/cascaders";
 import Property from '../../../common/orderDetail/property'; // 知识产权情况
 import Progress from './progress';
+import ApproveTypeTooltip from '../../../common/ApproveTypeTooltip';
 
 
 const confirm = Modal.confirm
@@ -4453,6 +4454,20 @@ const Task = React.createClass({
                             {getLiquidationStatus(this.state.liquidationStatus)}
                           </span>
                         </FormItem>
+                        { this.state.approval > 0 && <div className="clearfix">
+                          <FormItem
+                            labelCol={{ span: 4 }}
+                            wrapperCol={{ span: 20 }}
+                            label={
+                              <span className="mandatory" style={{fontSize: '12px'}}>
+                                提示
+                              </span>
+                            }
+                          >
+                            <ApproveTypeTooltip />
+                          </FormItem>
+                          </div>
+                        }
                         <FormItem
                           className="half-item"
                           {...formItemLayout}