dev01 %!s(int64=3) %!d(string=hai) anos
pai
achega
708eeb95e6

+ 16 - 14
js/component/manageCenter/order/orderNew/changeComponent/proAndCuiList.jsx

@@ -11,7 +11,7 @@ import {
   Col
 } from "antd";
 import $ from "jquery/src/ajax";
-import {getProjectStatus } from "@/tools.js"
+import { getProjectStatus } from "@/tools.js"
 import ResolutionDetail from "@/resolutionDetail";
 
 
@@ -149,17 +149,19 @@ const ProAndCuiList = React.createClass({
           key: "commodityName",
           render: (text, record) => {
             let dataArr = this.state.dataSource || [];
+            let texts = text
             if (record.ctid) {
-              return <span>{text + "-" + record.ctid}</span>;
+              return <span>{texts + "-" + record.ctid}</span>;
             } else {
               let tid = record.tid;
               let ctid = "";
               dataArr.forEach((item, index) => {
                 if (item.tid == tid) {
                   ctid = item.id;
+                  texts = item.commodityName;
                 }
               });
-              return <span>{text + "-" + ctid}</span>;
+              return <span>{texts + "-" + ctid}</span>;
             }
           },
         },
@@ -207,7 +209,7 @@ const ProAndCuiList = React.createClass({
             if (record.dunTypeName) {
               if (record.appropriationRatio) {
                 return <span>{record.appropriationRatio}(拨款比例)</span>;
-              }else {
+              } else {
                 if (this.props.isZxs) {
                   return <span>***</span>;
                 }
@@ -270,7 +272,7 @@ const ProAndCuiList = React.createClass({
       data: {
         id: id || this.props.id
       },
-      success: function(data) {
+      success: function (data) {
         if (data.data && data.data.length) {
           this.setState({
             cuiDataSource: data.data
@@ -290,7 +292,7 @@ const ProAndCuiList = React.createClass({
       data: {
         id: id || this.props.id
       },
-      success: function(data) {
+      success: function (data) {
         if (data.data && data.data.length) {
           data.data.forEach(item => {
             item.key = item.id
@@ -343,10 +345,10 @@ const ProAndCuiList = React.createClass({
                   {record.splitStatus == 1 ? (
                     <Tag
                       color="#108ee9"
-                      // onClick={e => {
-                      //   e.stopPropagation();
-                      //   this.showRes(record);
-                      // }}
+                    // onClick={e => {
+                    //   e.stopPropagation();
+                    //   this.showRes(record);
+                    // }}
                     >
                       父项目
                     </Tag>
@@ -356,10 +358,10 @@ const ProAndCuiList = React.createClass({
                   {record.splitStatus == 2 ? (
                     <Tag
                       color="#108ee9"
-                      // onClick={e => {
-                      //   e.stopPropagation();
-                      //   this.showRes(record);
-                      // }}
+                    // onClick={e => {
+                    //   e.stopPropagation();
+                    //   this.showRes(record);
+                    // }}
                     >
                       子项目
                     </Tag>