Browse Source

批次显示

HW 4 years ago
parent
commit
5207109ea5

+ 3 - 3
js/component/common/projectDetailsReadOnly/index.jsx

@@ -105,9 +105,9 @@ class ProjectDetailsReadOnly extends Component{
                                 <span>
                                     {
                                         declarationBatch === 1 ? '第一批' :
-                                            declarationBatch === 1 ? '第二批' :
-                                                declarationBatch === 1 ? '第三批' :
-                                                    declarationBatch === 1 ? '第四批' : '未知'
+                                            declarationBatch === 2 ? '第二批' :
+                                                declarationBatch === 3 ? '第三批' :
+                                                    declarationBatch === 4 ? '第四批' : '未知'
                                     }
                                 </span>
                             </FormItem>}

+ 47 - 0
js/component/manageCenter/order/orderNew/addService.jsx

@@ -2858,6 +2858,7 @@ const NewService = Form.create()(
         commodityPrice: "",
         addState: 1,
         addnextVisible: true,
+        dataInfor:{},
         displayFees: "none",
         officialCost: "",
         costReduction: "",
@@ -2976,6 +2977,7 @@ const NewService = Form.create()(
         main: record.main.toString(), //是否为主要
         addState: 0,
         addnextVisible: true,
+        dataInfor:record,
         addProjectType: record.type,
         declarationBatch: record.declarationBatch || 1,//申报批次(只有高新有)
         ifCertificationFee: isNaN(parseInt(record.ifCertificationFee)) ? '' : record.ifCertificationFee,//是否包含认证费
@@ -6703,6 +6705,51 @@ const NewService = Form.create()(
                         >
                           <span>{getboutique(this.state.main)}</span>
                         </FormItem>
+                        {this.state.dataInfor && this.state.dataInfor.type === 5 && <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label="企业申报批次"
+                        >
+                                <span>
+                                    {
+                                      this.state.declarationBatch === 1 ? '第一批' :
+                                          this.state.declarationBatch === 2 ? '第二批' :
+                                              this.state.declarationBatch === 3 ? '第三批' :
+                                                  this.state.declarationBatch === 4 ? '第四批' : '未知'
+                                    }
+                                </span>
+                        </FormItem>}
+                        {this.state.isIso && <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label="认证费"
+                        >
+                                <span>
+                                    {
+                                      this.state.ifCertificationFee === 1 ? '包含' :
+                                          this.state.ifCertificationFee === 0 ? '不包含' :'未知'
+                                    }
+                                </span>
+                        </FormItem> }
+                        {this.state.isIso && this.state.ifCertificationFee === 1 ?<FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label="认证费(万元)"
+                        >
+                          <span>{this.state.ifCertificationFee || '暂无'}</span>
+                        </FormItem> : null}
+                        {this.state.isIso && this.state.ifCertificationFee === 1 ? <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label=""
+                        /> : null}
+                        {this.state.isIso && this.state.ifCertificationFee === 1 ? <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label="付款公司名称"
+                        >
+                          <span>{this.state.certificationCorporate || '暂无'}</span>
+                        </FormItem>:null}
                         <div className="clearfix">
                           <FormItem
                             labelCol={{ span: 4 }}

+ 1 - 1
package.json

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