Browse Source

催款节点bug修复

dev01 2 years ago
parent
commit
cd369ced0e

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

@@ -1183,7 +1183,7 @@ const NewService = Form.create()(
             render: (text, record) => {
               if (record.dunTypeName) {
                 if (record.appropriationRatio) {
-                  let percent = Number(record.appropriationRatio * 100).toFixed(2).toFixed(2);
+                  let percent = Number(record.appropriationRatio * 100).toFixed(2);
                   percent += "%";
                   return <span>{percent}(拨款比例)</span>;
                 } else {

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

@@ -47,7 +47,7 @@ import Project from "../../../../component/project";
 import ImgList from "../../../common/imgList";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import LogPopup from "../../../common/logPopup";
-import Cascaders from "../../../common/cascaders"
+
 const { Option } = Select;
 const { TabPane } = Tabs;
 const PicturesWall = React.createClass({
@@ -1921,19 +1921,7 @@ const MyService = Form.create()(
                         this.setState({ customerName: e.target.value });
                       }}
                     />
-                    <Cascaders
-                      placeholder="订单部门"
-                      id="id"
-                      height={28}
-                      name="name"
-                      children="list"
-                      onSel={(e) => {
-                        this.setState({
-
-                        })
-                      }}
-                    />
-                    {/* <Select
+                    <Select
                       placeholder="订单部门"
                       style={{ width: 200, marginRight: 10 }}
                       value={this.state.departmenttList}
@@ -1944,7 +1932,7 @@ const MyService = Form.create()(
                       {departmentArr.map(function (item) {
                         return <Option key={item.id}>{item.name}</Option>;
                       })}
-                    </Select> */}
+                    </Select>
                     <Input
                       placeholder="合同编号"
                       style={{ width: "150px", marginRight: 10 }}

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "afanti",
-  "version": "1.2.35",
+  "version": "1.2.36",
   "description": "",
   "main": "index.js",
   "scripts": {

+ 0 - 71
package_BACKUP_1919.json

@@ -1,71 +0,0 @@
-{
-  "name": "afanti",
-<<<<<<< HEAD
-  "version": "1.2.20",
-=======
-  "version": "1.2.29",
->>>>>>> master
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "dlldev": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy dev --env.host 'http://127.0.0.1'",
-    "dlltest": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy test --env.host 'http://static.jishutao.com'",
-    "dllpro": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy prod --env.host 'https://s.jishutao.com'",
-    "build": "node bin/clean.js && webpack --progress --colors --env.deploy dev",
-    "buildtest": "node --max-old-space-size=8192 bin/clean.js && webpack --progress --colors --env.deploy test",
-    "buildstage": "node bin/clean.js && webpack --progress --colors --env.deploy stage",
-    "pro": "node --max-old-space-size=8192 bin/clean.js && webpack --progress --colors --env.deploy prod",
-    "dev": "webpack-dev-server --port 8080 --devtool eval --progress --colors --hot --content-base build --env.deploy dev --env.watch watch"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://git.coding.net/seirios/AFT-WEB-INF.git"
-  },
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "babel-core": "^6.23.1",
-    "babel-loader": "^6.3.2",
-    "babel-plugin-antd": "^0.5.1",
-    "babel-plugin-import": "^1.1.1",
-    "babel-preset-es2015": "^6.22.0",
-    "babel-preset-react": "^6.23.0",
-    "copy-webpack-plugin": "^4.3.1",
-    "css-loader": "^0.26.2",
-    "del": "^3.0.0",
-    "extract-text-webpack-plugin": "^2.1.0",
-    "file-loader": "^0.10.1",
-    "html-webpack-include-assets-plugin": "^1.0.2",
-    "html-webpack-plugin": "^2.28.0",
-    "jquery": "^3.1.1",
-    "jsx-loader": "^0.13.2",
-    "less": "^2.7.2",
-    "less-loader": "^2.2.3",
-    "react-hot-loader": "^1.3.1",
-    "react-router": "^3.0.2",
-    "react-to-print": "^2.4.0",
-    "style-loader": "^0.13.2",
-    "url-loader": "^0.5.8",
-    "webpack": "^2.2.1",
-    "webpack-dev-server": "^2.9.7"
-  },
-  "dependencies": {
-    "antd": "^2.7.4",
-    "dayjs": "^1.10.7",
-    "downloadjs": "^1.4.7",
-    "echarts": "^3.6.2",
-    "echarts-for-react": "^1.4.4",
-    "html2canvas": "^0.5.0-beta4",
-    "jquery": "^3.1.1",
-    "pdf": "^0.1.0",
-    "prop-types": "^15.5.10",
-    "react": "^15.4.1",
-    "react-dom": "^15.4.1",
-    "react-pdf": "^1.6.1",
-    "react-quill": "^1.0.0",
-    "viewer": "^0.10.11",
-    "viewerjs": "^1.6.2",
-    "xlsx-oc": "^1.0.2"
-  }
-}

+ 0 - 67
package_BASE_1919.json

@@ -1,67 +0,0 @@
-{
-  "name": "afanti",
-  "version": "1.2.19",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "dlldev": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy dev --env.host 'http://127.0.0.1'",
-    "dlltest": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy test --env.host 'http://static.jishutao.com'",
-    "dllpro": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy prod --env.host 'http://s.jishutao.com'",
-    "build": "node bin/clean.js && webpack --progress --colors --env.deploy dev",
-    "buildtest": "node --max-old-space-size=8192 bin/clean.js && webpack --progress --colors --env.deploy test",
-    "buildstage": "node bin/clean.js && webpack --progress --colors --env.deploy stage",
-    "pro": "node --max-old-space-size=8192 bin/clean.js && webpack --progress --colors --env.deploy prod",
-    "dev": "webpack-dev-server --port 8080 --devtool eval --progress --colors --hot --content-base build --env.deploy dev --env.watch watch"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://git.coding.net/seirios/AFT-WEB-INF.git"
-  },
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "babel-core": "^6.23.1",
-    "babel-loader": "^6.3.2",
-    "babel-plugin-antd": "^0.5.1",
-    "babel-plugin-import": "^1.1.1",
-    "babel-preset-es2015": "^6.22.0",
-    "babel-preset-react": "^6.23.0",
-    "copy-webpack-plugin": "^4.3.1",
-    "css-loader": "^0.26.2",
-    "del": "^3.0.0",
-    "extract-text-webpack-plugin": "^2.1.0",
-    "file-loader": "^0.10.1",
-    "html-webpack-include-assets-plugin": "^1.0.2",
-    "html-webpack-plugin": "^2.28.0",
-    "jquery": "^3.1.1",
-    "jsx-loader": "^0.13.2",
-    "less": "^2.7.2",
-    "less-loader": "^2.2.3",
-    "react-hot-loader": "^1.3.1",
-    "react-router": "^3.0.2",
-    "react-to-print": "^2.4.0",
-    "style-loader": "^0.13.2",
-    "url-loader": "^0.5.8",
-    "webpack": "^2.2.1",
-    "webpack-dev-server": "^2.9.7"
-  },
-  "dependencies": {
-    "antd": "^2.7.4",
-    "dayjs": "^1.10.7",
-    "downloadjs": "^1.4.7",
-    "echarts": "^3.6.2",
-    "echarts-for-react": "^1.4.4",
-    "html2canvas": "^0.5.0-beta4",
-    "jquery": "^3.1.1",
-    "pdf": "^0.1.0",
-    "prop-types": "^15.5.10",
-    "react": "^15.4.1",
-    "react-dom": "^15.4.1",
-    "react-pdf": "^1.6.1",
-    "react-quill": "^1.0.0",
-    "viewer": "^0.10.11",
-    "viewerjs": "^1.6.2",
-    "xlsx-oc": "^1.0.2"
-  }
-}

+ 0 - 67
package_LOCAL_1919.json

@@ -1,67 +0,0 @@
-{
-  "name": "afanti",
-  "version": "1.2.20",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "dlldev": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy dev --env.host 'http://127.0.0.1'",
-    "dlltest": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy test --env.host 'http://static.jishutao.com'",
-    "dllpro": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy prod --env.host 'http://s.jishutao.com'",
-    "build": "node bin/clean.js && webpack --progress --colors --env.deploy dev",
-    "buildtest": "node --max-old-space-size=8192 bin/clean.js && webpack --progress --colors --env.deploy test",
-    "buildstage": "node bin/clean.js && webpack --progress --colors --env.deploy stage",
-    "pro": "node --max-old-space-size=8192 bin/clean.js && webpack --progress --colors --env.deploy prod",
-    "dev": "webpack-dev-server --port 8080 --devtool eval --progress --colors --hot --content-base build --env.deploy dev --env.watch watch"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://git.coding.net/seirios/AFT-WEB-INF.git"
-  },
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "babel-core": "^6.23.1",
-    "babel-loader": "^6.3.2",
-    "babel-plugin-antd": "^0.5.1",
-    "babel-plugin-import": "^1.1.1",
-    "babel-preset-es2015": "^6.22.0",
-    "babel-preset-react": "^6.23.0",
-    "copy-webpack-plugin": "^4.3.1",
-    "css-loader": "^0.26.2",
-    "del": "^3.0.0",
-    "extract-text-webpack-plugin": "^2.1.0",
-    "file-loader": "^0.10.1",
-    "html-webpack-include-assets-plugin": "^1.0.2",
-    "html-webpack-plugin": "^2.28.0",
-    "jquery": "^3.1.1",
-    "jsx-loader": "^0.13.2",
-    "less": "^2.7.2",
-    "less-loader": "^2.2.3",
-    "react-hot-loader": "^1.3.1",
-    "react-router": "^3.0.2",
-    "react-to-print": "^2.4.0",
-    "style-loader": "^0.13.2",
-    "url-loader": "^0.5.8",
-    "webpack": "^2.2.1",
-    "webpack-dev-server": "^2.9.7"
-  },
-  "dependencies": {
-    "antd": "^2.7.4",
-    "dayjs": "^1.10.7",
-    "downloadjs": "^1.4.7",
-    "echarts": "^3.6.2",
-    "echarts-for-react": "^1.4.4",
-    "html2canvas": "^0.5.0-beta4",
-    "jquery": "^3.1.1",
-    "pdf": "^0.1.0",
-    "prop-types": "^15.5.10",
-    "react": "^15.4.1",
-    "react-dom": "^15.4.1",
-    "react-pdf": "^1.6.1",
-    "react-quill": "^1.0.0",
-    "viewer": "^0.10.11",
-    "viewerjs": "^1.6.2",
-    "xlsx-oc": "^1.0.2"
-  }
-}

+ 0 - 67
package_REMOTE_1919.json

@@ -1,67 +0,0 @@
-{
-  "name": "afanti",
-  "version": "1.2.29",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "dlldev": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy dev --env.host 'http://127.0.0.1'",
-    "dlltest": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy test --env.host 'http://static.jishutao.com'",
-    "dllpro": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy prod --env.host 'https://s.jishutao.com'",
-    "build": "node bin/clean.js && webpack --progress --colors --env.deploy dev",
-    "buildtest": "node --max-old-space-size=8192 bin/clean.js && webpack --progress --colors --env.deploy test",
-    "buildstage": "node bin/clean.js && webpack --progress --colors --env.deploy stage",
-    "pro": "node --max-old-space-size=8192 bin/clean.js && webpack --progress --colors --env.deploy prod",
-    "dev": "webpack-dev-server --port 8080 --devtool eval --progress --colors --hot --content-base build --env.deploy dev --env.watch watch"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://git.coding.net/seirios/AFT-WEB-INF.git"
-  },
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "babel-core": "^6.23.1",
-    "babel-loader": "^6.3.2",
-    "babel-plugin-antd": "^0.5.1",
-    "babel-plugin-import": "^1.1.1",
-    "babel-preset-es2015": "^6.22.0",
-    "babel-preset-react": "^6.23.0",
-    "copy-webpack-plugin": "^4.3.1",
-    "css-loader": "^0.26.2",
-    "del": "^3.0.0",
-    "extract-text-webpack-plugin": "^2.1.0",
-    "file-loader": "^0.10.1",
-    "html-webpack-include-assets-plugin": "^1.0.2",
-    "html-webpack-plugin": "^2.28.0",
-    "jquery": "^3.1.1",
-    "jsx-loader": "^0.13.2",
-    "less": "^2.7.2",
-    "less-loader": "^2.2.3",
-    "react-hot-loader": "^1.3.1",
-    "react-router": "^3.0.2",
-    "react-to-print": "^2.4.0",
-    "style-loader": "^0.13.2",
-    "url-loader": "^0.5.8",
-    "webpack": "^2.2.1",
-    "webpack-dev-server": "^2.9.7"
-  },
-  "dependencies": {
-    "antd": "^2.7.4",
-    "dayjs": "^1.10.7",
-    "downloadjs": "^1.4.7",
-    "echarts": "^3.6.2",
-    "echarts-for-react": "^1.4.4",
-    "html2canvas": "^0.5.0-beta4",
-    "jquery": "^3.1.1",
-    "pdf": "^0.1.0",
-    "prop-types": "^15.5.10",
-    "react": "^15.4.1",
-    "react-dom": "^15.4.1",
-    "react-pdf": "^1.6.1",
-    "react-quill": "^1.0.0",
-    "viewer": "^0.10.11",
-    "viewerjs": "^1.6.2",
-    "xlsx-oc": "^1.0.2"
-  }
-}