dev01 2 years ago
parent
commit
89291b6397

+ 15 - 6
js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx

@@ -110,6 +110,7 @@ const OrderDetail = Form.create()(
             title: "项目数量",
             dataIndex: "commodityQuantity",
             key: "commodityQuantity",
+            width: 50,
             render: (text, record) => {
               if (record.splitStatus == 1) {
                 return (
@@ -150,9 +151,10 @@ const OrderDetail = Form.create()(
             key: "certificateNumber",
           },
           {
-            title: "是否主要项目",
+            title: "主要项目",
             dataIndex: "main",
             key: "main",
+            width: 50,
             render: (text) => {
               return text ? "是" : "否";
             },
@@ -161,12 +163,19 @@ const OrderDetail = Form.create()(
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
+            width: 200,
             render: (text) => {
-              return text && text.length > 8 ? (
-                <span title={text}>{text.substr(0, 8)}...</span>
-              ) : (
-                text
-              );
+              return (
+                <Tooltip
+                  title={text}
+                >
+                  <div>
+                    {
+                      text && text.length > 16 ? <span title={text}>{text.substr(0, 16)}...</span> : text
+                    }
+                  </div>
+                </Tooltip>
+              )
             },
           },
         ],

+ 31 - 37
js/component/manageCenter/order/orderNew/pressList.jsx

@@ -551,21 +551,18 @@ const IntentionCustomer = Form.create()(
         exportPendingLoading: true,
       });
       let data = {
-        name: this.state.customerName ? this.state.customerName : undefined, //客户名称
-        adminName: this.state.adminName ? this.state.adminName : undefined, //订单负责人
-        orderNo: this.state.orderNo ? this.state.orderNo : undefined, //订单编号
-        contractNo: this.state.contractNo ? this.state.contractNo : undefined,
-        starTime: this.state.releaseDate[0]
-          ? this.state.releaseDate[0]
-          : undefined,
-        endTime: this.state.releaseDate[1]
-          ? this.state.releaseDate[1]
-          : undefined,
-        depId: this.state.departmenttSearch
-          ? this.state.departmenttSearch
-          : undefined, //订单部门
         pageSize: 9999999,
+        name: this.state.customerName, //名称
+        orderNo: this.state.orderNo, //订单编号
+        contractNo: this.state.contractNo,
+        depId: this.state.departmenttSearch, //订单部门
+        adminName: this.state.adminName, //责任人名称
+        starTime: this.state.releaseDate[0], //开始时间
+        endTime: this.state.releaseDate[1], //结束时间
         newStatus: this.state.newStatus,
+        amountStatus: this.state.amountStatus,//签单金额
+        approval: this.state.approval,//是否特批
+        memberType: this.state.memberType,//会员
       };
       $.ajax({
         method: "get",
@@ -668,9 +665,9 @@ const IntentionCustomer = Form.create()(
                   placeholder="客户名称"
                   style={{
                     width: 170,
-                    marginBottom: "10px",
-                    marginRight: 10,
-                    marginLeft: 10,
+                    marginBottom: 10,
+                    marginRight: 15,
+                    marginLeft: 15,
                   }}
                   value={this.state.customerName}
                   onChange={(e) => {
@@ -681,8 +678,8 @@ const IntentionCustomer = Form.create()(
                   placeholder="营销员名称"
                   style={{
                     width: 170,
-                    marginBottom: "10px",
-                    marginRight: 10,
+                    marginBottom: 10,
+                    marginRight: 15,
                   }}
                   value={this.state.adminName}
                   onChange={(e) => {
@@ -693,8 +690,8 @@ const IntentionCustomer = Form.create()(
                   placeholder="订单编号"
                   style={{
                     width: 170,
-                    marginBottom: "10px",
-                    marginRight: 10,
+                    marginBottom: 10,
+                    marginRight: 15,
                   }}
                   value={this.state.orderNo}
                   onChange={(e) => {
@@ -705,8 +702,8 @@ const IntentionCustomer = Form.create()(
                   placeholder="合同编号"
                   style={{
                     width: 170,
-                    marginBottom: "10px",
-                    marginRight: 10,
+                    marginBottom: 10,
+                    marginRight: 15,
                   }}
                   value={this.state.contractNo}
                   onChange={(e) => {
@@ -721,7 +718,7 @@ const IntentionCustomer = Form.create()(
                 />
                 <Select
                   placeholder="选择催款节点类型"
-                  style={{ width: 170, marginRight: "10px" }}
+                  style={{ width: 170, marginRight: 15, marginLeft: 5 }}
                   value={
                     this.state.newStatus == 0 ? "旧催款节点" : "新催款节点"
                   }
@@ -733,7 +730,7 @@ const IntentionCustomer = Form.create()(
                   <Select.Option key={1}>{"新催款节点"}</Select.Option>
                 </Select>
                 <Select
-                  style={{ width: 170 }}
+                  style={{ width: 170, marginRight: 15 }}
                   placeholder="签单金额"
                   value={this.state.amountStatus}
                   onChange={(e) => {
@@ -749,7 +746,7 @@ const IntentionCustomer = Form.create()(
                   <Option value="4">40万元以上</Option>
                 </Select>
                 <Select
-                  style={{ width: 170, marginRight: 60 }}
+                  style={{ width: 170, marginRight: 15 }}
                   placeholder="特批状态"
                   value={this.state.approval}
                   onChange={(e) => {
@@ -764,7 +761,7 @@ const IntentionCustomer = Form.create()(
                   <Option value="4">全部特批</Option>
                 </Select>
                 <Select
-                  style={{ width: 170, }}
+                  style={{ width: 170, marginRight: 30 }}
                   placeholder="会员"
                   value={this.state.memberType}
                   onChange={(e) => {
@@ -776,7 +773,7 @@ const IntentionCustomer = Form.create()(
                   <Option value="0">否</Option>
                   <Option value="1">是</Option>
                 </Select>
-                <span style={{ marginRight: 10, marginLeft: 10 }}>下单时间 :</span>
+                <span style={{ marginRight: 15, marginLeft: 15 }}>下单时间 :</span>
                 <RangePicker
                   value={[
                     this.state.releaseDate[0]
@@ -793,7 +790,7 @@ const IntentionCustomer = Form.create()(
                 <Button
                   type="primary"
                   onClick={this.search}
-                  style={{ marginLeft: "10px", marginRight: 10 }}
+                  style={{ marginLeft: 15, marginRight: 15, marginBottom: 10 }}
                 >
                   搜索
                 </Button>
@@ -936,15 +933,12 @@ const IntentionCustomer = Form.create()(
               </div>
             </Modal>
           </div>
-          {
-            // 订单详情
-            this.state.showDesc &&
-            <OrderDesc
-              data={this.state.RowData}
-              showDesc={this.state.showDesc}
-              closeDesc={this.closeDesc.bind(this)}
-            />
-          }
+          {/* 订单详情 */}
+          <OrderDesc
+            data={this.state.RowData}
+            showDesc={this.state.showDesc}
+            closeDesc={this.closeDesc.bind(this)}
+          />
         </div>
       );
     },