dev01 2 years ago
parent
commit
bd8fb13432

+ 2 - 2
js/component/manageCenter/channelList/channelunit/index.jsx

@@ -69,8 +69,8 @@ class ChannelUnit extends Component {
         },
         {
           title: "初始时间",
-          dataIndex: "createTime",
-          key: "createTime",
+          dataIndex: "transferTime",
+          key: "transferTime",
           width: 160,
         },
         {

+ 2 - 2
js/component/manageCenter/channelList/channelunit/publist.jsx

@@ -67,8 +67,8 @@ class ChannelUnit extends Component {
         },
         {
           title: "初始时间",
-          dataIndex: "createTime",
-          key: "createTime",
+          dataIndex: "transferTime",
+          key: "transferTime",
           width: 200,
         },
         {

+ 48 - 19
js/component/manageCenter/customer/publicStatistics/detailedList.jsx

@@ -486,6 +486,25 @@ class DetailedList extends Component {
     });
   }
 
+  componentWillMount() {
+    let _this = this
+    this.setState({
+      loading: true,
+      aid: this.props.aid,
+      depId: this.props.depId,
+      releaseDate: this.props.releaseDate,
+      createReleaseDate: this.props.createReleaseDate,
+    })
+    setTimeout(function () {
+      _this.loadData();
+      _this.setState({
+        loading: false
+      })
+    }, 300)
+    this.selectSuperId();
+  }
+
+
   loadData(pageNo) {
     this.setState({
       loading: true,
@@ -500,6 +519,8 @@ class DetailedList extends Component {
         pageSize: this.state.pagination.pageSize,
         releaseStart: this.state.releaseDate[0] || undefined,
         releaseEnd: this.state.releaseDate[1] || undefined,
+        createStart: this.state.createReleaseDate[0] || undefined,
+        createEnd: this.state.createReleaseDate[1] || undefined,
         aid: this.state.theTypes,
         sid: this.state.theTypes1 || undefined,
         uid: this.state.theCustomerTypes,
@@ -583,6 +604,7 @@ class DetailedList extends Component {
       }.bind(this),
     }).always(function () { }.bind(this));
   }
+
   supervisor1(e) {
     $.ajax({
       method: "get",
@@ -716,20 +738,6 @@ class DetailedList extends Component {
     });
   }
 
-  componentWillMount() {
-    let _this = this
-    this.setState({
-      loading: true
-    })
-    setTimeout(function () {
-      _this.loadData();
-      _this.setState({
-        loading: false
-      })
-    }, 300)
-    this.selectSuperId();
-  }
-
   exportExec() {
     message.config({
       duration: 20,
@@ -741,6 +749,8 @@ class DetailedList extends Component {
     let data = {
       releaseStart: this.state.releaseDate[0],
       releaseEnd: this.state.releaseDate[1],
+      createStart: this.state.createReleaseDate[0] || undefined,
+      createEnd: this.state.createReleaseDate[1] || undefined,
       aid: this.state.theTypes,
       sid: this.state.theTypes1,
       uid: this.state.theCustomerTypes,
@@ -859,7 +869,7 @@ class DetailedList extends Component {
                   <span style={{ marginRight: "10px" }}>
                     <Select
                       placeholder="请选择审核状态"
-                      style={{ width: 200, marginLeft: 10 }}
+                      style={{ width: 120, marginLeft: 10 }}
                       value={this.state.status}
                       onChange={(e) => {
                         this.setState({ status: e });
@@ -875,7 +885,7 @@ class DetailedList extends Component {
                   <span style={{ marginRight: "10px" }}>
                     <Select
                       placeholder="请选择打卡状态"
-                      style={{ width: 200, marginLeft: 10 }}
+                      style={{ width: 120, marginLeft: 10 }}
                       value={this.state.clockIn}
                       onChange={(e) => {
                         this.setState({ clockIn: e });
@@ -888,7 +898,7 @@ class DetailedList extends Component {
                   <span style={{ marginRight: "10px" }}>
                     <Select
                       placeholder="请选择公出类型"
-                      style={{ width: 200, marginLeft: 10 }}
+                      style={{ width: 120, marginLeft: 10 }}
                       value={this.state.type}
                       onChange={(e) => {
                         this.setState({ type: e });
@@ -900,7 +910,7 @@ class DetailedList extends Component {
                       <Select.Option value={3}>技术协单</Select.Option>
                     </Select>
                   </span>
-                  <span style={{ marginRight: "10px" }}>
+                  {/* <span style={{ marginRight: "10px" }}>
                     <AutoComplete
                       className="certain-category-search"
                       dropdownClassName="certain-category-search-dropdown"
@@ -916,7 +926,7 @@ class DetailedList extends Component {
                     >
                       <Input />
                     </AutoComplete>
-                  </span>
+                  </span> */}
                   <span style={{ marginRight: "10px" }}>
                     <AutoComplete
                       className="certain-category-search"
@@ -936,6 +946,25 @@ class DetailedList extends Component {
                   </span>
                   <span style={{ marginRight: "10px" }}>
                     <span style={{ marginRight: "5px", marginBottom: "10px" }}>
+                      创建时间 :
+                    </span>
+                    <RangePicker
+                      style={{ marginRight: "10px", marginBottom: "10px" }}
+                      value={[
+                        this.state.createReleaseDate[0]
+                          ? moment(this.state.createReleaseDate[0])
+                          : null,
+                        this.state.createReleaseDate[1]
+                          ? moment(this.state.createReleaseDate[1])
+                          : null,
+                      ]}
+                      onChange={(data, dataString) => {
+                        this.setState({ createReleaseDate: dataString });
+                      }}
+                    />
+                  </span>
+                  <span style={{ marginRight: "10px" }}>
+                    <span style={{ marginRight: "5px", marginBottom: "10px" }}>
                       公出时间 :
                     </span>
                     <RangePicker

+ 19 - 13
js/component/manageCenter/customer/publicStatistics/index.jsx

@@ -461,19 +461,25 @@ class ProjecCount extends Component {
                         />
                     </Spin>
                 </div>
-                {this.state.visible && <DetailedList
-                    status={this.state.status}
-                    title={this.state.title}
-                    aName={this.state.aName}
-                    clockIn={this.state.clockIn || undefined}
-                    visible={this.state.visible}
-                    aid={this.state.aid}
-                    onCancel={() => {
-                        this.setState({
-                            visible: false,
-                            clockIn: 0,
-                        })
-                    }} />}
+                {this.state.visible &&
+                    <DetailedList
+                        status={this.state.status}
+                        title={this.state.title}
+                        aid={this.state.aid}
+                        aName={this.state.aName}
+                        depId={this.state.depId}
+                        createReleaseDate={this.state.createReleaseDate}
+                        releaseDate={this.state.releaseDate}
+                        clockIn={this.state.clockIn || undefined}
+                        visible={this.state.visible}
+                        onCancel={() => {
+                            this.setState({
+                                visible: false,
+                                clockIn: 0,
+                            })
+                        }}
+                    />
+                }
             </div>
         )
     }

+ 11 - 1
js/component/manageCenter/customer/publicSummary/index.jsx

@@ -394,8 +394,8 @@ class PublicSummary extends Component {
     this.httpCustomerChange = this.httpCustomerChange.bind(this);
     this.blurCustomerChange = this.blurCustomerChange.bind(this);
     this.exportExec = this.exportExec.bind(this);
+    this.addRowColor = this.addRowColor.bind(this)
   }
-
   //获取上级组织
   selectSuperId() {
     $.ajax({
@@ -431,6 +431,15 @@ class PublicSummary extends Component {
     );
   }
 
+  addRowColor(record) {
+    if (record.assist === 1 || record.assist === 2) {
+      return 'light'
+    } else {
+      return 'dark'
+    }
+  }
+
+
   changeList(arr) {
     const newArr = [];
     this.state.columns.forEach((item) => {
@@ -958,6 +967,7 @@ class PublicSummary extends Component {
                 }
                 dataSource={this.state.dataSource}
                 pagination={this.state.pagination}
+                rowClassName={this.addRowColor}
               />
             </Spin>
           </div>

+ 14 - 3
js/component/manageCenter/customer/publicSummary/index.less

@@ -1,11 +1,22 @@
-.projectTable{
+.projectTable {
   cursor: pointer;
 }
 
-.projectTable:hover{
+.projectTable:hover {
   background: #71a7e885 !important;
 }
 
-.ant-upload-list{
+.ant-upload-list {
   display: inline-block !important;
 }
+
+.light {
+  // background: #87CEEB;
+  background: #D3D3D3;
+  // background: #CD8162;
+}
+
+.dark {
+  background: white;
+  // background: #87CEEB;
+}

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

@@ -5048,14 +5048,29 @@ const NewService = Form.create()(
                               {...formItemLayout}
                               label="销售类型"
                             >
-                              <span>{(["私有客户-", "签单客户-"][this.state.userType] || " ") +
-                                (salesList[this.state.salesType] || "")}</span>
+                              <span>{(["私有客户-", "签单客户-"][this.state.updatas.userType] || " ") +
+                                (salesList[this.state.updatas.salesType] || "")}</span>
                               {
                                 this.state.processStatus === 0 &&
                                 <UpdateSales
                                   orderNo={this.state.orderNo}
                                   updatas={this.state.updatas}
-                                  onRefresh={this.loaduser.bind(this, { orderNo: this.state.orderNo })}
+                                  onRefresh={
+                                    e => {
+                                      let ups = this.state.updatas
+                                      ups.salesType = e.salesType
+                                      if (e.salesType == "3") {
+                                        ups.channelId = e.channelid
+                                        ups.other = e.channelname
+                                      } else if (e.salesType == "4" || e.salesType == "5") {
+                                        ups.other = e.other
+                                      }
+                                      this.setState({
+                                        updatas: ups
+                                      })
+                                    }
+                                    // this.loaduser.bind(this, { orderNo: this.state.orderNo })
+                                  }
                                 />
                               }
                             </FormItem>
@@ -6355,15 +6370,24 @@ const NewService = Form.create()(
                               >
                                 保存
                               </Button>
-                              <Button
-                                className="cancel"
-                                type="danger"
-                                onClick={this.examOks}
-                                style={{ marginLeft: "50px" }}
-                                loading={this.state.loading}
+                              <Popconfirm
+                                title="请确认您是否作废此订单??"
+                                onConfirm={(e) => {
+                                  this.examOks()
+                                }}
+                                okText="确认"
+                                cancelText="取消"
                               >
-                                订单作废
-                              </Button>
+                                <Button
+                                  className="cancel"
+                                  type="danger"
+                                  // onClick={this.examOks}
+                                  style={{ marginLeft: "50px" }}
+                                  loading={this.state.loading}
+                                >
+                                  订单作废
+                                </Button>
+                              </Popconfirm>
                               <Button
                                 className="cancel"
                                 type="ghost"

+ 1 - 1
js/component/manageCenter/order/orderNew/costAuditList/index.js

@@ -508,7 +508,7 @@ class CostAuditList extends Component{
         return (
           <div className="user-content">
               <div className="content-title" style={{ marginBottom: 10 }}>
-                  <span style={{ fontWeight: 900, fontSize: 16 }}>{this.props.isPatentManager ? '专利成本审核' : '成本付款申请'}</span>
+                  <span style={{ fontWeight: 900, fontSize: 16 }}>{this.props.isPatentManager ? '专利成本审核' : '成本支付审核'}</span>
               </div>
               <Tabs defaultActiveKey="1" onChange={this.callback} className="test">
                   <TabPane tab="搜索" key="1">

+ 35 - 12
js/component/manageCenter/order/orderNew/reject.jsx

@@ -2060,12 +2060,27 @@ const IntentionCustomer = Form.create()(
                       {...formItemLayout}
                       label="销售类型"
                     >
-                      <span>{(["私有客户-", "签单客户-"][this.state.userType] || " ") +
-                        (salesList[this.state.salesType] || "")}</span>
+                      <span>{(["私有客户-", "签单客户-"][this.state.updatas.userType] || " ") +
+                        (salesList[this.state.updatas.salesType] || "")}</span>
                       <UpdateSales
                         orderNo={this.state.orderNo}
                         updatas={this.state.updatas}
-                        onRefresh={this.xiangqing.bind(this, this.state.orderNo)}
+                        onRefresh={
+                          e => {
+                            let ups = this.state.updatas
+                            ups.salesType = e.salesType
+                            if (e.salesType == "3") {
+                              ups.channelId = e.channelid
+                              ups.other = e.channelname
+                            } else if (e.salesType == "4" || e.salesType == "5") {
+                              ups.other = e.other
+                            }
+                            this.setState({
+                              updatas: ups
+                            })
+                          }
+                          //this.xiangqing.bind(this, this.state.orderNo)
+                        }
                       />
                     </FormItem>
                     <FormItem
@@ -2576,16 +2591,24 @@ const IntentionCustomer = Form.create()(
                       >
                         重新提交
                       </Button>
-                      <Button
-                        className="cancel"
-                        type="danger"
-                        onClick={this.examOks}
-                        style={{ marginLeft: "50px" }}
-                        htmlType="submit"
-                        loading={this.state.flag}
+                      <Popconfirm
+                        title="请确认您是否作废此订单??"
+                        onConfirm={(e) => {
+                          this.examOks()
+                        }}
+                        okText="确认"
+                        cancelText="取消"
                       >
-                        订单作废
-                      </Button>
+                        <Button
+                          className="cancel"
+                          type="danger"
+                          // onClick={this.examOks}
+                          style={{ marginLeft: "50px" }}
+                          loading={this.state.flag}
+                        >
+                          订单作废
+                        </Button>
+                      </Popconfirm>
                       <Button
                         className="cancel"
                         type="ghost"

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

@@ -82,7 +82,7 @@ class UpdateSales extends Component {
         });
         if (!data.error.length) {
           message.success("修改成功!");
-          onRefresh();
+          onRefresh(datas);
           this.close();
         } else {
           message.warning(data.error[0].message);

+ 1 - 1
package.json

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