|
@@ -43,16 +43,14 @@ import {
|
|
|
moneyVerify,
|
|
|
ShowModal
|
|
|
} from "@/tools";
|
|
|
-import { taskStatus, projectStatus } from "@/dataDic.js";
|
|
|
+import { projectStatus } from "@/dataDic.js";
|
|
|
import ShowModalDiv from "@/showModal.jsx";
|
|
|
import CheckProject from "../../components/checkProject";
|
|
|
import ImgList from "../../../common/imgList";
|
|
|
import NewSupplier from "./newSupplier";
|
|
|
import OperationPayNode from "./operationPayNode";
|
|
|
const FormItem = Form.Item;
|
|
|
-const { TabPane } = Tabs;
|
|
|
const { Option } = Select;
|
|
|
-const { MonthPicker, RangePicker } = DatePicker;
|
|
|
const { TextArea } = Input;
|
|
|
const confirm = Modal.confirm
|
|
|
const PicturesWall = React.createClass({
|
|
@@ -1006,6 +1004,7 @@ const MyTaskOutsource = React.createClass({
|
|
|
taskStatus: thisdata.taskStatus.toString(), //项目状态
|
|
|
taskDate: thisdata.taskDate, //分配时间
|
|
|
taskComment: thisdata.taskComment, //说明
|
|
|
+ taskCommentData: thisdata.taskComment, //原项目说明
|
|
|
attachmentUrl: thisdata.attachmentUrl
|
|
|
? splitUrl(
|
|
|
thisdata.attachmentUrl,
|
|
@@ -1579,6 +1578,7 @@ const MyTaskOutsource = React.createClass({
|
|
|
commodityPrice: record.commodityPrice, //金额
|
|
|
commodityQuantity: record.commodityQuantity, //数量
|
|
|
taskComment: record.taskComment, //备注
|
|
|
+ taskCommentData: record.taskComment, //原项目说明
|
|
|
main: record.main.toString(), //是否为主要
|
|
|
addnextVisible: true,
|
|
|
addState: 0,
|
|
@@ -1602,6 +1602,7 @@ const MyTaskOutsource = React.createClass({
|
|
|
this.state.projectStatusSearch = undefined; //项目状态
|
|
|
this.state.taskStatuSearch = undefined; //项目状态
|
|
|
this.state.taskComment = ""; //说明
|
|
|
+ this.state.taskCommentData = "";
|
|
|
this.state.startDate = ""; //启动日期
|
|
|
this.state.endDate = ""; //结束日期
|
|
|
this.state.acceptDate = ""; //受理日期
|
|
@@ -1617,7 +1618,6 @@ const MyTaskOutsource = React.createClass({
|
|
|
this.state.hours = ""; //工时
|
|
|
this.state.remarks = ""; //说明
|
|
|
this.state.taskDate = ""; //日期
|
|
|
- this.state.taskComment = ""; //说明
|
|
|
this.state.nameSearch = "";
|
|
|
this.state.releaseDate = [];
|
|
|
this.state.orderNoSearch = "";
|
|
@@ -3432,59 +3432,83 @@ const MyTaskOutsource = React.createClass({
|
|
|
<Radio value={2}>其他</Radio>
|
|
|
</Radio.Group>
|
|
|
</FormItem>
|
|
|
- <FormItem
|
|
|
- className="half-item"
|
|
|
- {...formItemLayout}
|
|
|
- label="退单"
|
|
|
- >
|
|
|
- <Radio.Group
|
|
|
- value={this.state.taskRefund}
|
|
|
- onChange={(e) => {
|
|
|
- this.setState({ taskRefund: e.target.value });
|
|
|
- }}
|
|
|
- >
|
|
|
- <Radio value={0}>已完成</Radio>
|
|
|
- <Radio value={1}>未完成</Radio>
|
|
|
- <Radio value={2}>其他</Radio>
|
|
|
- </Radio.Group>
|
|
|
- </FormItem>
|
|
|
- </div>
|
|
|
- <div className="clearfix">
|
|
|
{
|
|
|
<FormItem
|
|
|
- className="half-item"
|
|
|
- {...formItemLayout}
|
|
|
- label="(满意度)备注"
|
|
|
+ className="half-item"
|
|
|
+ {...formItemLayout}
|
|
|
+ label="(满意度)备注"
|
|
|
>
|
|
|
<Input
|
|
|
- type="textarea"
|
|
|
- placeholder="请输入备注"
|
|
|
- rows={2}
|
|
|
- value={this.state.retrieveContent}
|
|
|
- onChange={(e) => {
|
|
|
- this.setState({
|
|
|
- retrieveContent: e.target.value,
|
|
|
- });
|
|
|
- }}
|
|
|
+ type="textarea"
|
|
|
+ placeholder="请输入备注"
|
|
|
+ rows={2}
|
|
|
+ value={this.state.retrieveContent}
|
|
|
+ onChange={(e) => {
|
|
|
+ this.setState({
|
|
|
+ retrieveContent: e.target.value,
|
|
|
+ });
|
|
|
+ }}
|
|
|
/>
|
|
|
</FormItem>
|
|
|
}
|
|
|
- {
|
|
|
- <FormItem
|
|
|
- className="half-item"
|
|
|
- {...formItemLayout}
|
|
|
- label="(退单)备注"
|
|
|
- >
|
|
|
+ {/*<FormItem*/}
|
|
|
+ {/* className="half-item"*/}
|
|
|
+ {/* {...formItemLayout}*/}
|
|
|
+ {/* label="退单"*/}
|
|
|
+ {/*>*/}
|
|
|
+ {/* <Radio.Group*/}
|
|
|
+ {/* value={this.state.taskRefund}*/}
|
|
|
+ {/* onChange={(e) => {*/}
|
|
|
+ {/* this.setState({ taskRefund: e.target.value });*/}
|
|
|
+ {/* }}*/}
|
|
|
+ {/* >*/}
|
|
|
+ {/* <Radio value={0}>已完成</Radio>*/}
|
|
|
+ {/* <Radio value={1}>未完成</Radio>*/}
|
|
|
+ {/* <Radio value={2}>其他</Radio>*/}
|
|
|
+ {/* </Radio.Group>*/}
|
|
|
+ {/*</FormItem>*/}
|
|
|
+ </div>
|
|
|
+ <div className="clearfix">
|
|
|
+ <div style={{
|
|
|
+ paddingLeft: '8%',
|
|
|
+ }}>
|
|
|
+ <div style={{color:'#000',fontWeight:500}}>
|
|
|
+ 特别说明
|
|
|
+ <span style={{color: '#58a3ff',}}>(针对项目的特殊情况说明)</span>
|
|
|
+ </div>
|
|
|
+ <div style={{display:'flex',alignItems:'center',paddingTop: '10px'}}>
|
|
|
+ <div>备注:</div>
|
|
|
<Input
|
|
|
- type="textarea"
|
|
|
- placeholder="请输入备注"
|
|
|
- rows={2}
|
|
|
- value={this.state.refundContent}
|
|
|
- onChange={(e) => {
|
|
|
- this.setState({ refundContent: e.target.value });
|
|
|
- }}
|
|
|
+ type="textarea"
|
|
|
+ placeholder="请输入备注"
|
|
|
+ rows={3}
|
|
|
+ style={{
|
|
|
+ width:'33%',
|
|
|
+ marginLeft: '10px',
|
|
|
+ }}
|
|
|
+ value={this.state.specialExplain}
|
|
|
+ onChange={(e) => {
|
|
|
+ this.setState({ specialExplain: e.target.value });
|
|
|
+ }}
|
|
|
/>
|
|
|
- </FormItem>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ {
|
|
|
+ // <FormItem
|
|
|
+ // className="half-item"
|
|
|
+ // {...formItemLayout}
|
|
|
+ // label="(退单)备注"
|
|
|
+ // >
|
|
|
+ // <Input
|
|
|
+ // type="textarea"
|
|
|
+ // placeholder="请输入备注"
|
|
|
+ // rows={2}
|
|
|
+ // value={this.state.refundContent}
|
|
|
+ // onChange={(e) => {
|
|
|
+ // this.setState({ refundContent: e.target.value });
|
|
|
+ // }}
|
|
|
+ // />
|
|
|
+ // </FormItem>
|
|
|
}
|
|
|
</div>
|
|
|
<div className="clearfix">
|
|
@@ -4008,14 +4032,19 @@ const MyTaskOutsource = React.createClass({
|
|
|
<FormItem
|
|
|
labelCol={{ span: 3 }}
|
|
|
wrapperCol={{ span: 16 }}
|
|
|
- label="备注"
|
|
|
+ label="项目说明"
|
|
|
>
|
|
|
<Input
|
|
|
type="textarea"
|
|
|
- placeholder="请输入备注"
|
|
|
+ placeholder="请输入项目说明"
|
|
|
rows={4}
|
|
|
value={this.state.taskComment}
|
|
|
onChange={(e) => {
|
|
|
+ let len = this.state.taskCommentData.length;
|
|
|
+ if(e.target.value.slice(0,len) !== this.state.taskCommentData){
|
|
|
+ message.warning('项目说明不允许删除与修改已存在的内容');
|
|
|
+ return;
|
|
|
+ }
|
|
|
this.setState({ taskComment: e.target.value });
|
|
|
}}
|
|
|
/>
|
|
@@ -4861,30 +4890,11 @@ const MyTaskOutsource = React.createClass({
|
|
|
</Radio.Group>
|
|
|
</FormItem>
|
|
|
<FormItem
|
|
|
- className="half-item"
|
|
|
- {...formItemLayout}
|
|
|
- label="退单"
|
|
|
- >
|
|
|
- <Radio.Group
|
|
|
- value={this.state.taskRefund}
|
|
|
- onChange={(e) => {
|
|
|
- this.setState({ taskRefund: e.target.value });
|
|
|
- }}
|
|
|
- >
|
|
|
- <Radio value={0}>已完成</Radio>
|
|
|
- <Radio value={1}>未完成</Radio>
|
|
|
- <Radio value={2}>其他</Radio>
|
|
|
- </Radio.Group>
|
|
|
- </FormItem>
|
|
|
- </div>
|
|
|
- <div className="clearfix">
|
|
|
- {
|
|
|
- <FormItem
|
|
|
className="half-item"
|
|
|
{...formItemLayout}
|
|
|
label="(满意度)备注"
|
|
|
- >
|
|
|
- <Input
|
|
|
+ >
|
|
|
+ <Input
|
|
|
type="textarea"
|
|
|
placeholder="请输入备注"
|
|
|
rows={2}
|
|
@@ -4892,25 +4902,66 @@ const MyTaskOutsource = React.createClass({
|
|
|
onChange={(e) => {
|
|
|
this.setState({ retrieveContent: e.target.value });
|
|
|
}}
|
|
|
- />
|
|
|
- </FormItem>
|
|
|
- }
|
|
|
- {
|
|
|
- <FormItem
|
|
|
- className="half-item"
|
|
|
- {...formItemLayout}
|
|
|
- label="(退单)备注"
|
|
|
- >
|
|
|
+ />
|
|
|
+ </FormItem>
|
|
|
+ {/*<FormItem*/}
|
|
|
+ {/* className="half-item"*/}
|
|
|
+ {/* {...formItemLayout}*/}
|
|
|
+ {/* label="退单"*/}
|
|
|
+ {/*>*/}
|
|
|
+ {/* <Radio.Group*/}
|
|
|
+ {/* value={this.state.taskRefund}*/}
|
|
|
+ {/* onChange={(e) => {*/}
|
|
|
+ {/* this.setState({ taskRefund: e.target.value });*/}
|
|
|
+ {/* }}*/}
|
|
|
+ {/* >*/}
|
|
|
+ {/* <Radio value={0}>已完成</Radio>*/}
|
|
|
+ {/* <Radio value={1}>未完成</Radio>*/}
|
|
|
+ {/* <Radio value={2}>其他</Radio>*/}
|
|
|
+ {/* </Radio.Group>*/}
|
|
|
+ {/*</FormItem>*/}
|
|
|
+ </div>
|
|
|
+ <div className="clearfix">
|
|
|
+ <div style={{
|
|
|
+ paddingLeft: '8%',
|
|
|
+ }}>
|
|
|
+ <div style={{color:'#000',fontWeight:500}}>
|
|
|
+ 特别说明
|
|
|
+ <span style={{color: '#58a3ff',}}>(针对项目的特殊情况说明)</span>
|
|
|
+ </div>
|
|
|
+ <div style={{display:'flex',alignItems:'center',paddingTop: '10px'}}>
|
|
|
+ <div>备注:</div>
|
|
|
<Input
|
|
|
- type="textarea"
|
|
|
- placeholder="请输入备注"
|
|
|
- rows={2}
|
|
|
- value={this.state.refundContent}
|
|
|
- onChange={(e) => {
|
|
|
- this.setState({ refundContent: e.target.value });
|
|
|
- }}
|
|
|
+ type="textarea"
|
|
|
+ placeholder="请输入备注"
|
|
|
+ rows={3}
|
|
|
+ style={{
|
|
|
+ width:'33%',
|
|
|
+ marginLeft: '10px',
|
|
|
+ }}
|
|
|
+ value={this.state.specialExplain}
|
|
|
+ onChange={(e) => {
|
|
|
+ this.setState({ specialExplain: e.target.value });
|
|
|
+ }}
|
|
|
/>
|
|
|
- </FormItem>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ {
|
|
|
+ // <FormItem
|
|
|
+ // className="half-item"
|
|
|
+ // {...formItemLayout}
|
|
|
+ // label="(退单)备注"
|
|
|
+ // >
|
|
|
+ // <Input
|
|
|
+ // type="textarea"
|
|
|
+ // placeholder="请输入备注"
|
|
|
+ // rows={2}
|
|
|
+ // value={this.state.refundContent}
|
|
|
+ // onChange={(e) => {
|
|
|
+ // this.setState({ refundContent: e.target.value });
|
|
|
+ // }}
|
|
|
+ // />
|
|
|
+ // </FormItem>
|
|
|
}
|
|
|
</div>
|
|
|
<div className="clearfix">
|
|
@@ -5135,14 +5186,19 @@ const MyTaskOutsource = React.createClass({
|
|
|
<FormItem
|
|
|
labelCol={{ span: 3 }}
|
|
|
wrapperCol={{ span: 16 }}
|
|
|
- label="备注"
|
|
|
+ label="项目说明"
|
|
|
>
|
|
|
<Input
|
|
|
type="textarea"
|
|
|
- placeholder="请输入备注"
|
|
|
+ placeholder="请输入项目说明"
|
|
|
rows={4}
|
|
|
value={this.state.taskComment}
|
|
|
onChange={(e) => {
|
|
|
+ let len = this.state.taskCommentData.length;
|
|
|
+ if(e.target.value.slice(0,len) !== this.state.taskCommentData){
|
|
|
+ message.warning('项目说明不允许删除与修改已存在的内容');
|
|
|
+ return;
|
|
|
+ }
|
|
|
this.setState({ taskComment: e.target.value });
|
|
|
}}
|
|
|
/>
|