Forráskód Böngészése

审核流程修改,

dev01 2 éve%!(EXTRA string=óta)
szülő
commit
a55641ccf1

+ 15 - 3
js/component/dataDic.js

@@ -2586,15 +2586,27 @@ module.exports = {
     },
     {
       value: "1",
-      key: "特批",
+      key: "总裁待审核",
     },
     {
       value: "2",
-      key: "通过",
+      key: "总裁通过",
     },
     {
       value: "3",
-      key: "驳回",
+      key: "总裁驳回",
+    },
+    {
+      value: "4",
+      key: "董事长待审核",
+    },
+    {
+      value: "5",
+      key: "董事长通过",
+    },
+    {
+      value: "6",
+      key: "董事长驳回",
     },
   ],
   //交易外联

+ 29 - 28
js/component/manageCenter/order/orderNew/approveds.jsx

@@ -2576,34 +2576,35 @@ const IntentionCustomer = Form.create()(
                         </Form>
                       </Spin>
                     </div>
-                    {this.state.approval === 1 && <div className="addSave" style={{ marginTop: "15px" }}>
-                      <Button
-                        className="cancel"
-                        type="primary"
-                        onClick={this.pass}
-                        style={{ marginLeft: "200px" }}
-                        htmlType="submit"
-                      >
-                        通过
-                      </Button>
-                      <Button
-                        className="cancel"
-                        type="primary"
-                        onClick={this.examNo}
-                        style={{ marginLeft: "50px" }}
-                        htmlType="submit"
-                      >
-                        驳回
-                      </Button>
-                      <Button
-                        className="cancel"
-                        type="ghost"
-                        onClick={this.visitCancel}
-                        style={{ marginLeft: "50px" }}
-                      >
-                        取消
-                      </Button>
-                    </div>}
+                    {(this.state.approval === 1 || this.state.approval === 4) &&
+                      <div className="addSave" style={{ marginTop: "15px" }}>
+                        <Button
+                          className="cancel"
+                          type="primary"
+                          onClick={this.pass}
+                          style={{ marginLeft: "200px" }}
+                          htmlType="submit"
+                        >
+                          通过
+                        </Button>
+                        <Button
+                          className="cancel"
+                          type="primary"
+                          onClick={this.examNo}
+                          style={{ marginLeft: "50px" }}
+                          htmlType="submit"
+                        >
+                          驳回
+                        </Button>
+                        <Button
+                          className="cancel"
+                          type="ghost"
+                          onClick={this.visitCancel}
+                          style={{ marginLeft: "50px" }}
+                        >
+                          取消
+                        </Button>
+                      </div>}
                   </div>
                 </Spin>
               </Form>

+ 11 - 7
js/component/manageCenter/order/orderNew/examine.jsx

@@ -1077,6 +1077,10 @@ const IntentionCustomer = Form.create()(
     },
     //审核不通过
     examOks() {
+      if (!this.state.reason) {
+        message.warn("请先填写拒绝理由");
+        return
+      }
       this.setState({
         loading: true,
       });
@@ -1098,7 +1102,7 @@ const IntentionCustomer = Form.create()(
             if (data.error && data.error.length) {
               message.warning(data.error[0].message);
               this.setState({
-                aloading: true,
+                aloading: false,
                 loading: false,
               });
             }
@@ -1523,12 +1527,12 @@ const IntentionCustomer = Form.create()(
                   return (
                     <Tooltip title={text}>
                       <div
-                        // style={{
-                        //   width: 100,
-                        //   overflow: "hidden",
-                        //   whiteSpace: "nowrap",
-                        //   textOverflow: "ellipsis",
-                        // }}
+                      // style={{
+                      //   width: 100,
+                      //   overflow: "hidden",
+                      //   whiteSpace: "nowrap",
+                      //   textOverflow: "ellipsis",
+                      // }}
                       >{text}</div>
                     </Tooltip>
                   )

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 516 - 525
js/component/project.jsx


+ 9 - 3
js/component/tools.js

@@ -1736,11 +1736,17 @@ module.exports = {
       if (e == 0) {
         return "非特批";
       } else if (e == 1) {
-        return "特批待审核";
+        return "特批总裁待审核";
       } else if (e == 2) {
-        return "特批通过";
+        return "特批总裁通过";
       } else if (e == 3) {
-        return "特批驳回";
+        return "特批总裁驳回";
+      } else if (e == 4) {
+        return "特批董事长待审核";
+      } else if (e == 5) {
+        return "特批董事长通过";
+      } else if (e == 6) {
+        return "特批董事长驳回";
       } else {
         return "未知";
       }