Merge branch 'master' into 登录优化

packageA/project/detail.wxml

@@ -23,7 +23,7 @@
     <Product slot='产品配置单' id='Product' signamount_due="{{detail.signamount_due}}" discountrate="{{detail.discountrate * 100}}" disabled="{{(per.query(options,'product')||isAdmin||isLeader)&&detail.status=='跟进中'}}" />
     <Contacts slot='联系人' id='Contacts' disabled="{{(per.query(options,'contacts')||isAdmin||isLeader)&& disabled}}" />
     <Opponent slot='竞争对手' id='Opponent' disabled="{{(per.query(options,'opposites')||isAdmin||isLeader) && disabled}}" />
-    <Offers slot='报价单' id='Offers' disabled="{{(per.query(options,'offer')||isAdmin||isLeader)&& disabled}}" isInsert='{{isInsert}}' />
+    <Offers slot='报价单' id='Offers' disabled="{{(per.query(options,'offer')||isAdmin||isLeader)&& disabled}}" />
     <Record slot='操作记录' id="Record" ownertable='sa_project' ownerid='{{detail.sa_projectid}}' />
     <ReportingProgress slot='报备进度' id='ReportingProgress' />
     <Files slot='附件' id="Files" ownertable='sa_project' ownerid='{{detail.sa_projectid}}' disabled="{{(per.query(options,'opposites')||isAdmin||isLeader) && disabled}}" />

packageA/project/modules/offers/index.js

@@ -44,23 +44,15 @@ Component({
             })
         },
         addOffers() {
-            if (this.data.isInsert) {
-                const {
-                    projectname,
-                    sa_projectid
-                } = getCurrentPages().find(v => v.__route__ == 'packageA/project/detail').data.detail;
-                wx.navigateTo({
-                    url: `/packageA/offers/addProjectOffer?sa_projectid=${JSON.stringify({
-                        sa_projectid:[projectname,[sa_projectid]]
-                    })}`,
-                })
-            } else {
-                wx.showToast({
-                    title: '当前项目未审核或报备审核未通过，不可创建报价单',
-                    icon: "none",
-                    mask: true
-                })
-            }
+            const {
+                projectname,
+                sa_projectid
+            } = getCurrentPages().find(v => v.__route__ == 'packageA/project/detail').data.detail;
+            wx.navigateTo({
+                url: `/packageA/offers/addProjectOffer?sa_projectid=${JSON.stringify({
+                    sa_projectid:[projectname,[sa_projectid]]
+                })}`,
+            })
         },
         /* 修改总数 */
         changeTotal() {