Browse Source

8.23需求

dev01 2 years ago
parent
commit
95e43f246c

+ 1 - 1
js/component/common/cascaders/index.jsx

@@ -6,7 +6,7 @@ import "./index.less";
 /**
  * 部门多选组件  2022-07-12
  * <Cascaders
- *   ref={node => this.Cascaders = node}
+ *   ref={ref => this.Cascaders = ref}
  *   placeholder="请选择公出部门"
  *   id="id"
  *   name="name"

+ 37 - 1
js/component/common/projectOperation/newEditProject.jsx

@@ -4,7 +4,7 @@ import { boutique } from "../../dataDic";
 import $ from "jquery";
 import { getboutique, splitUrl } from "../../tools";
 import moment from "moment";
-import { vipYear } from "../../dataDic";
+import { vipYear, YearList } from "../../dataDic";
 import ImgList from "../imgList";
 
 const FormItem = Form.Item;
@@ -52,6 +52,7 @@ class newEditProject extends Component {
       splitList: [],//子集
       addFrom: false,
       isMedit: 0,
+      isYear: false,//审计是否需要修改上年度年份
     }
     this.getpatentTypeList = this.getpatentTypeList.bind(this);
     this.setValue = this.setValue.bind(this);
@@ -122,6 +123,8 @@ class newEditProject extends Component {
       ifCertificationFee: isNaN(parseInt(dataInfor.ifCertificationFee)) ? '' : dataInfor.ifCertificationFee,//是否包含认证费
       isIso: dataInfor.commodityName.indexOf("贯标") !== -1,
       orgCodeUrl: dataInfor.pictureUrl ? splitUrl(dataInfor.pictureUrl, ",", globalConfig.avatarHost + "/upload") : [],//
+      isYear: !dataInfor.lastYear ? true : false,//
+      lastYear: dataInfor.lastYear,//上年度年份
       lastYearCapital: dataInfor.lastYearCapital,//上年度总资本
       lastYearIncome: dataInfor.lastYearIncome,//上年度总收入
       isVip: dataInfor.cSort,
@@ -160,6 +163,10 @@ class newEditProject extends Component {
         message.warning("服务数量与服务年限不符!");
         return
       }
+      if (this.state.isYear && !this.state.lastYear) {
+        message.warning("请选择上年度年份!");
+        return
+      }
       if (isNaN(parseFloat(this.state.lastYearCapital))) {
         message.warning("请输入正确的企业上年度总资本!");
         return
@@ -228,6 +235,7 @@ class newEditProject extends Component {
     }
     if (this.state.addProjectType == "3") {//审计
       infor.serviceLife = JSON.stringify(this.state.serviceLife) //服务年限
+      infor.lastYear = this.state.lastYear //上年度年份
       infor.lastYearCapital = this.state.lastYearCapital //上年度总资本
       infor.lastYearIncome = this.state.lastYearIncome //上年度总收入
     }
@@ -867,6 +875,34 @@ class newEditProject extends Component {
                   >
                     <span style={{ color: "red" }}>注:派单年度的上年度总资产和收入。如,当前为2022年,那么需要填写2021年的总资产和收入!</span>
                   </FormItem>
+                  {
+                    this.state.isYear && !readOnly &&
+                    <div className="clearfix">
+                      <FormItem
+                        className="half-item"
+                        label="企业上年度年份"
+                        {...formItemLayout}
+                      >
+                        <Select
+                          style={{ width: '200px' }}
+                          placeholder="请选择年份"
+                          value={this.state.lastYear}
+                          onChange={e => {
+                            this.setState({
+                              lastYear: e,
+                            })
+                          }}
+                        >
+                          {
+                            YearList.map(its => (
+                              <Option key={its}>{its}</Option>
+                            ))
+                          }
+                        </Select>
+                        <span className="mandatory">*</span>
+                      </FormItem>
+                    </div>
+                  }
                   <FormItem
                     className="half-item"
                     label="企业上年度总资本(万元)"

+ 5 - 0
js/component/dataDic.js

@@ -4121,5 +4121,10 @@ module.exports = {
     '2017年', '2018年', '2019年', '2020年', '2021年',
     '2022年', '2023年', '2024年', '2025年', '2026年',
     '2027年', '2028年', '2029年', '2030年', '2031年',
+  ],
+  YearList: [
+    '2017', '2018', '2019', '2020', '2021',
+    '2022', '2023', '2024', '2025', '2026',
+    '2027', '2028', '2029', '2030', '2031',
   ]
 };

File diff suppressed because it is too large
+ 421 - 421
js/component/manageCenter/customer/NEW/signCustomer/signCustomer.jsx


+ 21 - 17
js/component/manageCenter/customer/publicSummary/index.jsx

@@ -140,23 +140,27 @@ class PublicSummary extends Component {
           key: "status",
           width: 200,
           render: (text, record) => (
-            <div style={{ display: "flex", flexDirection: "row" }}>
-              <Tag
-                color={["#45b97c", "#69541b", "#f47920", "#8552a1", "#228fbd"][record.type]}
-              >
-                {
-                  record.type === 0
-                    ? "业务公出" : record.type === 1
-                      ? "技术公出" : record.type === 2
-                        ? "行政公出" : record.type === 3
-                          ? "技术协单" : record.type === 4
-                            ? "协单助手" : ""
-                }
-              </Tag>
-              <Tag color={getClockState(text).color}>
-                {getClockState(text).title}
-              </Tag>
-              {record.updateStatus == 1 && <Tag color="#1E90FF">改</Tag>}
+            <div>
+              <div style={{ display: "flex", flexDirection: "row" }}>
+                <Tag
+                  color={["#45b97c", "#69541b", "#f47920", "#8552a1", "#228fbd"][record.type]}
+                >
+                  {
+                    record.type === 0
+                      ? "业务公出" : record.type === 1
+                        ? "技术公出" : record.type === 2
+                          ? "行政公出" : record.type === 3
+                            ? "技术协单" : record.type === 4
+                              ? "协单助手" : ""
+                  }
+                </Tag>
+                <Tag color={getClockState(text).color}>
+                  {getClockState(text).title}
+                </Tag>
+                {record.updateStatus == 1 && <Tag color="#1E90FF">改</Tag>}
+              </div>
+              {record.type === 1 && <div style={{ marginTop: 5 }}>{record.contractNo}</div>}
+              {record.type === 1 && <div>{record.totalAmout + "(万元)"}</div>}
             </div>
           ),
         },

+ 10 - 4
js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx

@@ -1541,10 +1541,16 @@ const ShouKuang = React.createClass({
     this.departmentList();
   },
   tableRowClick(record) {
-    this.state.RowData = record;
-    this.setState({
-      showDesc: true,
-    });
+    let isName = record.sellerName.indexOf("曹津") != -1
+    let iskeep = window.adminData.shiroList.indexOf("13") != -1
+    if (iskeep && isName) {
+      message.warning("无法查看,请联系管理员!");
+    } else {
+      this.setState({
+        RowData: record,
+        showDesc: true,
+      });
+    }
   },
   closeDesc(e, s) {
     this.state.showDesc = e;

+ 4 - 4
js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js

@@ -490,13 +490,13 @@ class OrderDetail extends Component {
           columns = [
             {
               title: "负责人",
-              dataIndex: "contacts",
-              key: "contacts",
+              dataIndex: "receiverName",
+              key: "receiverName",
             },
             {
               title: "负责人电话",
-              dataIndex: "contactsMobile",
-              key: "contactsMobile",
+              dataIndex: "receiverMobile",
+              key: "receiverMobile",
             },
             {
               title: "项目状态",

+ 24 - 19
js/component/manageCenter/order/orderNew/contractCwzj.js

@@ -393,25 +393,30 @@ const contractChange = Form.create()(
     },
     //整行点击
     tableRowClick(record) {
-      this.setState(
-        {
-          visible: true,
-          type: record.type,
-          status: record.status,
-          buttonStatus: true,
-          orderStatus: record.orderStatus,
-          processStateText: record.processStateText,
-          id: record.id,
-          orderNo: record.orderNo
-        },
-        () => {
-          this.xiangqing(record.orderNo);
-          this.xiangmu(record.orderNo);
-          this.jiedian(record.orderNo);
-          this.jiedianNew(record.orderNo);
-          this.createTabs();
-        }
-      );
+      let isName = record.salesmanName.indexOf("曹津") != -1
+      let iskeep = window.adminData.shiroList.indexOf("13") != -1
+      if (iskeep && isName) {
+        message.warning("无法查看,请联系管理员!");
+      } else {
+        this.setState(
+          {
+            visible: true,
+            type: record.type,
+            status: record.status,
+            buttonStatus: true,
+            orderStatus: record.orderStatus,
+            processStateText: record.processStateText,
+            id: record.id,
+            orderNo: record.orderNo
+          }, () => {
+            this.xiangqing(record.orderNo);
+            this.xiangmu(record.orderNo);
+            this.jiedian(record.orderNo);
+            this.jiedianNew(record.orderNo);
+            this.createTabs();
+          }
+        );
+      }
     },
     //点击打卡项目详情
     tableRowClickX(record) {

+ 2 - 2
js/component/manageCenter/order/orderNew/contractJsjl.js

@@ -1135,10 +1135,10 @@ const contractChange = Form.create()(
         pictureUrl: []
       });
     },
-    getOrgCodeUrl(e) {
+    getOrgCodeUrl(e) { 
       this.setState({ pictureUrl: e });
     },
-    //关闭详情
+    //关闭详情 
     visitCancel() {
       this.setState(
         {