Browse Source

新增变更类型(框架协议)

dev01 1 year ago
parent
commit
45e7125839

+ 10 - 1
js/component/common/flowchart/index.jsx

@@ -212,6 +212,14 @@ class FlowChart extends Component {
               { status: 2, title: "营销管理员审核", name: info.yxgly, time: "" },
             ]
 
+            // 8 框架协议
+            let theArr8 = [
+              { status: 0, title: "营销员发起", name: info.yxy, time: "" },
+              { status: 1, title: "经理审核", name: !info.yxjl ? "-" : info.yxjl, time: "" },
+              { status: 2, title: "营销管理员审核", name: info.yxgly, time: "" },
+              { status: 6, title: "财务专员审核", name: info.cwzy, time: "" },
+            ]
+
             theArr = info.type == 0
               ? theArr0 : info.type == 1
                 ? theArr1 : info.type == 2
@@ -219,7 +227,8 @@ class FlowChart extends Component {
                     ? theArr3 : info.type == 4
                       ? theArr4 : info.type == 5
                         ? theArr5 : info.type == 6
-                          ? theArr6 : info.type == 7 && theArr7
+                          ? theArr6 : info.type == 7
+                            ? theArr7 : info.type == 8 && theArr8
 
             // name为“-”不需要显示
             let list = theArr.filter(v => {

+ 1 - 0
js/component/common/projectOperation/newAddProject.jsx

@@ -113,6 +113,7 @@ class NewAddProject extends Component {
       isGive: undefined,//是否赠送
       splitList: [],//子集
       addFrom: false,
+      serviceYear: moment().format("YYYY") + "年",
     }
     this.onSubmit = this.onSubmit.bind(this);
     this.httpChange = this.httpChange.bind(this);

+ 4 - 0
js/component/dataDic.js

@@ -3695,6 +3695,10 @@ module.exports = {
       value: "7",
       key: "仅变更合同",
     },
+    {
+      value: "8",
+      key: "框架协议(仅已签框架合同适用)",
+    },
   ],
   cuiJieDian: [
     {

+ 5 - 2
js/component/manageCenter/order/orderNew/addService.jsx

@@ -3714,7 +3714,8 @@ const NewService = Form.create()(
       if (
         this.state.typeChange == 0 ||
         this.state.typeChange == 1 ||
-        this.state.typeChange == 3
+        this.state.typeChange == 3 ||
+        this.state.typeChange == 8
       ) {
         if (Number(this.state.settlementAmount) < Number(this.state.changeAmount)) {
           message.warning("退款金额大于已收款金额");
@@ -4440,7 +4441,8 @@ const NewService = Form.create()(
       if (
         this.state.typeChange == 0 ||
         this.state.typeChange == 1 ||
-        this.state.typeChange == 3
+        this.state.typeChange == 3 ||
+        this.state.typeChange == 8
       ) {
         if (Number(this.state.settlementAmount) < Number(this.state.changeAmount)) {
           message.warning("退款金额大于已收款金额");
@@ -7474,6 +7476,7 @@ const NewService = Form.create()(
                                   <Option value={5}>赠送</Option>
                                   <Option value={6}>退单不退款</Option>
                                   <Option value={7}>仅变更合同</Option>
+                                  <Option value={8}>框架协议(仅已签框架合同适用)</Option>
                                 </Select>
                                 <Button
                                   style={{ marginLeft: 10 }}

+ 5 - 2
js/component/manageCenter/order/orderNew/changeComponent/changeApply.js

@@ -999,7 +999,8 @@ class ChangeApply extends Component {
     if (
       this.state.data.type == 0 ||
       this.state.data.type == 1 ||
-      this.state.data.type == 3
+      this.state.data.type == 3 ||
+      this.state.data.type == 8
     ) {
       if (Number(this.state.data.settlementAmount) < Number(this.state.data.changeAmount)) {
         message.warning("退款金额大于已收款金额");
@@ -1608,7 +1609,8 @@ class ChangeApply extends Component {
     if (
       this.state.typeChange == 0 ||
       this.state.typeChange == 1 ||
-      this.state.typeChange == 3
+      this.state.typeChange == 3 ||
+      this.state.typeChange == 8
     ) {
       if (this.state.settlementAmount < this.state.changeAmount) {
         message.warning("退款金额大于已收款金额");
@@ -2422,6 +2424,7 @@ class ChangeApply extends Component {
                 <Option value={5}>赠送</Option>
                 <Option value={6}>退单不退款</Option>
                 <Option value={7}>仅变更合同</Option>
+                <Option value={8}>框架协议(仅已签框架合同适用)</Option>
               </Select>
               <Button
                 style={{ marginLeft: 10 }}

+ 0 - 3
js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxjl.js

@@ -658,9 +658,6 @@ class ChangeDetail extends Component {
           </div>
         </div>
         {
-          console.log(this.props.processState, "==", this.props.data.processState)
-        }
-        {
           ((this.props.processState == this.props.data.processState) &&
             (this.props.data.status == 1 || this.props.data.status == 3)) &&
           <div>

+ 6 - 3
js/component/manageCenter/order/orderNew/changeComponent/searchInput.js

@@ -77,12 +77,11 @@ class PrimarySelect extends Component {
 
   render() {
     const Datas = this.props.searchSelectData;
-    const newShiroList = window.adminData.shiroList.split(",") || [];
     return (
       <Select
         style={{ width: Datas.width, marginRight: 10 }}
         placeholder={Datas.placeholder}
-        disabled={(newShiroList.includes("3")) && Datas.placeholder == "审核状态"}
+        disabled={this.props.shiroList == "yxgly" && Datas.placeholder == "审核状态"}
         value={this.state.value}
         onChange={e => {
           Datas.getValue(e);
@@ -341,6 +340,10 @@ class SearchInput extends Component {
             name: "仅变更合同",
             id: "7",
           },
+          {
+            name: "框架协议(仅已签框架合同适用)",
+            id: "8",
+          },
         ],
         getValue: value => {
           this.setState({
@@ -419,7 +422,7 @@ class SearchInput extends Component {
           }
           return (
             <PrimarySelect
-              processState={this.props.processState}
+              shiroList={this.props.shiroList}
               searchSelectData={item}
               key={index}
               reset={this.state.reset}

+ 1 - 1
js/component/manageCenter/order/orderNew/contractYxgly.js

@@ -1210,7 +1210,7 @@ const contractChange = Form.create()(
               className="test">
               <TabPane tab="搜索" key="1">
                 <div style={{ marginLeft: 10 }}>
-                  <SearchInput search={this.search} processState={this.props.processState}/>
+                  <SearchInput search={this.search} shiroList="yxgly"/>
                 </div>
               </TabPane>
               <TabPane tab="更改表格显示数据" key="2">

+ 1 - 1
package.json

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