dev01 2 years ago
parent
commit
6c8e01f938

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

@@ -50,14 +50,7 @@ class PublicSummary extends Component {
           fixed: "left",
           render: (text) => {
             return (
-              <div
-                style={{
-                  width: 80,
-                  wordBreak: "break-all",
-                }}
-              >
-                {text}
-              </div>
+              <div>{text}</div>
             );
           },
         },

+ 17 - 12
js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx

@@ -901,7 +901,6 @@ const ShouKuang = React.createClass({
           title: "订单编号",
           dataIndex: "orderNo",
           key: "orderNo",
-          // fixed: "left"
         },
         {
           title: "客户名称",
@@ -1001,14 +1000,14 @@ const ShouKuang = React.createClass({
             return getProcessStatus(text);
           },
         },
-        {
-          title: "特批状态",
-          dataIndex: "approval",
-          key: "approval",
-          render: (text) => {
-            return getApproval(text);
-          },
-        },
+        // {
+        //   title: "特批状态",
+        //   dataIndex: "approval",
+        //   key: "approval",
+        //   render: (text) => {
+        //     return getApproval(text);
+        //   },
+        // },
       ],
       columns: [
         {
@@ -1034,7 +1033,7 @@ const ShouKuang = React.createClass({
           key: "contractNo",
           className: "title-table",
           fixed: "left",
-          width: 130,
+          // width: 130,
           render: (text, record) => {
             return (
               <Tooltip
@@ -1058,7 +1057,11 @@ const ShouKuang = React.createClass({
                   {text}
                   <div style={{ display: "flex" }}>
                     <OrderItemStatus deleteSign={record.deleteSign} />
-                    {(record.approval == 1 || record.approval == 2) && <Tag color="#ff0000">特批</Tag>}
+                    {
+                      record.approval == 1
+                        ? <Tag color="#faa755">特批待审</Tag> :
+                        record.approval == 2 && <Tag color="#ff0000">特批通过</Tag>
+                    }
                   </div>
                 </div>
               </Tooltip>
@@ -2538,7 +2541,9 @@ const ShouKuang = React.createClass({
                 }}
               >
                 <Option value="0">非特批</Option>
-                <Option value="1">特批</Option>
+                <Option value="1">特批待审</Option>
+                <Option value="2">特批通过</Option>
+                <Option value="4">全部特批</Option>
               </Select>
               <Select
                 style={{ width: 120 }}

+ 8 - 3
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -1044,7 +1044,6 @@ const ShouKuang = React.createClass({
           key: "contractNo",
           // className: "title-table",
           fixed: "left",
-          width: 130,
           render: (text, record) => {
             return (
               <Tooltip
@@ -1068,7 +1067,11 @@ const ShouKuang = React.createClass({
                   {text}
                   <div style={{ display: "flex" }}>
                     <OrderItemStatus deleteSign={record.deleteSign} />
-                    {(record.approval == 1 || record.approval == 2) && <Tag color="#ff0000">特批</Tag>}
+                    {
+                      record.approval == 1
+                        ? <Tag color="#faa755">特批待审</Tag> :
+                        record.approval == 2 && <Tag color="#ff0000">特批通过</Tag>
+                    }
                   </div>
                 </div>
               </Tooltip>
@@ -2627,7 +2630,9 @@ const ShouKuang = React.createClass({
                 }}
               >
                 <Option value="0">非特批</Option>
-                <Option value="1">特批</Option>
+                <Option value="1">特批待审</Option>
+                <Option value="2">特批通过</Option>
+                <Option value="4">全部特批</Option>
               </Select>
               <Select
                 style={{ width: 120 }}

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

@@ -486,7 +486,6 @@ const MyService = Form.create()(
             title: "合同编号",
             dataIndex: "contractNo",
             key: "contractNo",
-            width: 130,
             render: (text, record) => {
               return (
                 <Tooltip
@@ -510,7 +509,11 @@ const MyService = Form.create()(
                     {text}
                     <div style={{ display: "flex" }}>
                       <OrderItemStatus deleteSign={record.deleteSign} />
-                      {(record.approval == 1 || record.approval == 2) && <Tag color="#ff0000">特批</Tag>}
+                      {
+                        record.approval == 1
+                          ? <Tag color="#faa755">特批待审</Tag> :
+                          record.approval == 2 && <Tag color="#ff0000">特批通过</Tag>
+                      }
                     </div>
                   </div>
                 </Tooltip>
@@ -1961,7 +1964,9 @@ const MyService = Form.create()(
                       }}
                     >
                       <Option value="0">非特批</Option>
-                      <Option value="1">特批</Option>
+                      <Option value="1">特批待审</Option>
+                      <Option value="2">特批通过</Option>
+                      <Option value="4">全部特批</Option>
                     </Select>
                     <Select
                       style={{ width: 120 }}

+ 103 - 14
js/component/manageCenter/order/orderNew/examine.jsx

@@ -140,6 +140,7 @@ const IntentionCustomer = Form.create()(
           approval: this.state.approvalSearch, //特批状态搜索
           processStatus: this.state.processStatusSearch,
           amountStatus: this.state.amountStatus,
+          projectType: this.state.projectType,//会员
         },
         success: function (data) {
           ShowModal(this);
@@ -155,7 +156,10 @@ const IntentionCustomer = Form.create()(
                 key: i,
                 id: thisdata.id, //用户ID
                 salesType: thisdata.salesType, //销售类型
+                deleteSign: thisdata.deleteSign,
+                projectType: thisdata.projectType,
                 other: thisdata.other,
+                contractNo: thisdata.contractNo, //合同编号
                 orderNo: thisdata.orderNo, //订单编号
                 totalAmount: thisdata.totalAmount, //签单金额
                 processStatus: thisdata.processStatus, //流程状态
@@ -237,19 +241,43 @@ const IntentionCustomer = Form.create()(
             },
           },
           {
-            title: "订单编号",
-            dataIndex: "orderNo",
-            key: "orderNo",
-          },
-          {
-            title: "下单时间",
-            dataIndex: "createDate",
-            key: "createTime",
-          },
-          {
-            title: "合同签订时间",
-            dataIndex: "signDate",
-            key: "signDate",
+            title: "合同编号",
+            dataIndex: "contractNo",
+            key: "contractNo",
+            className: "title-table",
+            render: (text, record) => {
+              return (
+                <Tooltip
+                  title={
+                    <Button
+                      type="primary"
+                      onClick={(e) => {
+                        e.stopPropagation();
+                        let input = document.getElementById("copyText");
+                        input.value = text;
+                        input.select();
+                        document.execCommand("copy");
+                        message.success("复制成功");
+                      }}
+                    >
+                      复制
+                    </Button>
+                  }
+                >
+                  <div>
+                    {text}
+                    <div style={{ display: "flex" }}>
+                      <OrderItemStatus deleteSign={record.deleteSign} />
+                      {
+                        record.approval == 1
+                          ? <Tag color="#faa755">特批待审</Tag> :
+                          record.approval == 2 && <Tag color="#ff0000">特批通过</Tag>
+                      }
+                    </div>
+                  </div>
+                </Tooltip>
+              );
+            },
           },
           {
             title: "客户名称",
@@ -269,6 +297,51 @@ const IntentionCustomer = Form.create()(
             },
           },
           {
+            title: "订单编号",
+            dataIndex: "orderNo",
+            key: "orderNo",
+            width: 140,
+            render: (text, record) => {
+              return (
+                <Tooltip
+                  title={
+                    <Button
+                      type="primary"
+                      onClick={(e) => {
+                        e.stopPropagation();
+                        let input = document.getElementById("copyText");
+                        input.value = text;
+                        input.select();
+                        document.execCommand("copy");
+                        message.success("复制成功");
+                      }}
+                    >
+                      复制
+                    </Button>
+                  }
+                >
+                  <div>
+                    {text}
+                    <div>
+                      {record.totalAmount >= 10 && <Tag color="#ef7207">大客户</Tag>}
+                      {record.projectType == 1 && <Tag color="rgb(22, 155, 213)">会员</Tag>}
+                    </div>
+                  </div>
+                </Tooltip>
+              );
+            },
+          },
+          {
+            title: "下单时间",
+            dataIndex: "createDate",
+            key: "createTime",
+          },
+          {
+            title: "合同签订时间",
+            dataIndex: "signDate",
+            key: "signDate",
+          },
+          {
             title: "流程状态",
             dataIndex: "processStatus",
             key: "processStatus",
@@ -1209,6 +1282,7 @@ const IntentionCustomer = Form.create()(
       this.state.approvalSearch = undefined;
       this.state.amountStatus = undefined;
       this.state.processStatusSearch = undefined;
+      this.state.projectType = undefined;
       this.loadData(1);
     },
     outReset() {
@@ -1418,7 +1492,9 @@ const IntentionCustomer = Form.create()(
                   }}
                 >
                   <Option value="0">非特批</Option>
-                  <Option value="1">特批</Option>
+                  <Option value="1">特批待审</Option>
+                  <Option value="2">特批通过</Option>
+                  <Option value="4">全部特批</Option>
                 </Select>
                 <Select
                   style={{ width: 120 }}
@@ -1437,6 +1513,19 @@ const IntentionCustomer = Form.create()(
                   <Option value="4">40万元以上</Option>
                 </Select>
                 <Select
+                  style={{ width: 120 }}
+                  placeholder="会员状态"
+                  value={this.state.projectType}
+                  onChange={(e) => {
+                    this.setState({
+                      projectType: e,
+                    });
+                  }}
+                >
+                  <Option value="1">会员</Option>
+                  <Option value="0">非会员</Option>
+                </Select>
+                <Select
                   style={{ width: 150 }}
                   placeholder="流程状态"
                   value={this.state.processStatusSearch}

+ 21 - 15
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -692,7 +692,7 @@ const IntentionCustomer = Form.create()(
             dataIndex: "contractNo",
             key: "contractNo",
             // fixed: 'left'
-            width: 130,
+            // width: 130,
             render: (text, record) => {
               return (
                 <Tooltip
@@ -716,7 +716,11 @@ const IntentionCustomer = Form.create()(
                     {text}
                     <div style={{ display: "flex" }}>
                       <OrderItemStatus deleteSign={record.deleteSign} />
-                      {(record.approval == 1 || record.approval == 2) && <Tag color="#ff0000">特批</Tag>}
+                      {
+                        record.approval == 1
+                          ? <Tag color="#faa755">特批待审</Tag> :
+                          record.approval == 2 && <Tag color="#ff0000">特批通过</Tag>
+                      }
                     </div>
                   </div>
                 </Tooltip>
@@ -2415,7 +2419,9 @@ const IntentionCustomer = Form.create()(
                     }}
                   >
                     <Option value="0">非特批</Option>
-                    <Option value="1">特批</Option>
+                    <Option value="1">特批待审</Option>
+                    <Option value="2">特批通过</Option>
+                    <Option value="4">全部特批</Option>
                   </Select>
                   <Select
                     style={{ width: 120 }}
@@ -2434,18 +2440,18 @@ const IntentionCustomer = Form.create()(
                     <Option value="4">40万元以上</Option>
                   </Select>
                   <Select
-                      style={{ width: 120 }}
-                      placeholder="会员状态"
-                      value={this.state.projectType}
-                      onChange={(e) => {
-                        this.setState({
-                          projectType: e,
-                        });
-                      }}
-                    >
-                      <Option value="1">会员</Option>
-                      <Option value="0">非会员</Option>
-                    </Select>
+                    style={{ width: 120 }}
+                    placeholder="会员状态"
+                    value={this.state.projectType}
+                    onChange={(e) => {
+                      this.setState({
+                        projectType: e,
+                      });
+                    }}
+                  >
+                    <Option value="1">会员</Option>
+                    <Option value="0">非会员</Option>
+                  </Select>
                   <Select
                     style={{ width: 140 }}
                     placeholder="流程状态"

+ 1 - 1
package.json

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