Browse Source

Merge branch 'master' of http://git.jishutao.com/frontEnd/kede-tool-weapp

anderx 3 weeks ago
parent
commit
2c84258f71
3 changed files with 65 additions and 26 deletions
  1. 2 5
      src/pages/applyDepart/index.jsx
  2. 32 11
      src/pages/customerProfile/index.jsx
  3. 31 10
      src/pages/interview/myUser.jsx

+ 2 - 5
src/pages/applyDepart/index.jsx

@@ -176,11 +176,8 @@ class ApplyDepart extends Component {
 
   setTabDisabled(item) {
     let userInfo = Taro.getStorageSync('userInfor');
-    //技术公出不是技术角色就隐藏
-    if (item.type === 1 && userInfo.type !== 3) {
-      return true;
-      //业务公出是营销角色就隐藏
-    } else if (item.type === 2 && userInfo.type === 1) {
+    // 角色为营销,并且岗位为营销只能业务公出
+    if ([1,2].indexOf(item.type) > -1 && userInfo.type == 1 && userInfo.position == 1) {
       return true;
     }
     //其他不隐藏

+ 32 - 11
src/pages/customerProfile/index.jsx

@@ -1700,7 +1700,7 @@ class CustomerProfile extends Component {
             )}
         </View>
 
-        <AtModal
+        { this.state.isOpened && <AtModal
           isOpened={this.state.isOpened}
           onClose={() => {
             this.setState({
@@ -1757,9 +1757,13 @@ class CustomerProfile extends Component {
                   type='number'
                   value={info.inventionPatentCount}
                   onChange={e => {
+                    let val = e;
+                    if (val.toString().length > 1) {
+                      val = val.toString().replace(/^0+/, '');
+                    }
                     this.setState({
                       info: Object.assign(info, {
-                        inventionPatentCount: e,
+                        inventionPatentCount: val,
                       })
                     })
                   }}
@@ -1771,9 +1775,13 @@ class CustomerProfile extends Component {
                   type='number'
                   value={info.utilityModelCount}
                   onChange={e => {
+                    let val = e;
+                    if (val.toString().length > 1) {
+                      val = val.toString().replace(/^0+/, '');
+                    }
                     this.setState({
                       info: Object.assign(info, {
-                        utilityModelCount: e,
+                        utilityModelCount: val,
                       })
                     })
                   }}
@@ -1785,9 +1793,13 @@ class CustomerProfile extends Component {
                   type='number'
                   value={info.appearancePatentCount}
                   onChange={e => {
+                    let val = e;
+                    if (val.toString().length > 1) {
+                      val = val.toString().replace(/^0+/, '');
+                    }
                     this.setState({
                       info: Object.assign(info, {
-                        appearancePatentCount: e,
+                        appearancePatentCount: val,
                       })
                     })
                   }}
@@ -1799,9 +1811,13 @@ class CustomerProfile extends Component {
                   type='number'
                   value={info.softwareWorksCount}
                   onChange={e => {
+                    let val = e;
+                    if (val.toString().length > 1) {
+                      val = val.toString().replace(/^0+/, '');
+                    }
                     this.setState({
                       info: Object.assign(info, {
-                        softwareWorksCount: e,
+                        softwareWorksCount: val,
                       })
                     })
                   }}
@@ -1830,9 +1846,13 @@ class CustomerProfile extends Component {
                   type='number'
                   value={info.otherCount}
                   onChange={e => {
+                    let val = e;
+                    if (val.toString().length > 1) {
+                      val = val.toString().replace(/^0+/, '');
+                    }
                     this.setState({
                       info: Object.assign(info, {
-                        otherCount: e,
+                        otherCount: val,
                       })
                     })
                   }}
@@ -2092,8 +2112,9 @@ class CustomerProfile extends Component {
             <Button type='primary' onClick={this.update}>确定修改</Button>
           </AtModalAction>
         </AtModal>
-
-        <AtModal
+        }
+        
+        { this.state.isAdd && <AtModal
           isOpened={this.state.isAdd}
           onClose={() => {
             this.setState({
@@ -2199,8 +2220,8 @@ class CustomerProfile extends Component {
             <Button type='primary' onClick={this.add}>保存</Button>
           </AtModalAction>
         </AtModal>
-
-        <AtModal
+        }
+        {/* <AtModal
           isOpened={this.state.addItemShow}
           onClose={this.handleCloseAddItemDialog}
         >
@@ -2220,7 +2241,7 @@ class CustomerProfile extends Component {
             <Button type='secondary' onClick={this.handleCloseAddItemDialog}>取消</Button>
             <Button type='primary' onClick={this.handleAddItemSave}>保存</Button>
           </AtModalAction>
-        </AtModal>
+        </AtModal> */}
 
 
         {/* 多选框 */}

+ 31 - 10
src/pages/interview/myUser.jsx

@@ -1940,7 +1940,7 @@ class CustomerProfile extends Component {
             )}
         </View>
 
-        <AtModal
+        { this.state.isOpened && <AtModal
           isOpened={this.state.isOpened}
           onClose={() => {
             this.setState({
@@ -1961,9 +1961,13 @@ class CustomerProfile extends Component {
                   type='number'
                   value={info.inventionPatentCount}
                   onChange={e => {
+                    let val = e;
+                    if (val.toString().length > 1) {
+                      val = val.toString().replace(/^0+/, '');
+                    }
                     this.setState({
                       info: Object.assign(info, {
-                        inventionPatentCount: e,
+                        inventionPatentCount: val,
                       })
                     })
                   }}
@@ -1975,9 +1979,13 @@ class CustomerProfile extends Component {
                   type='number'
                   value={info.utilityModelCount}
                   onChange={e => {
+                    let val = e;
+                    if (val.toString().length > 1) {
+                      val = val.toString().replace(/^0+/, '');
+                    }
                     this.setState({
                       info: Object.assign(info, {
-                        utilityModelCount: e,
+                        utilityModelCount: val,
                       })
                     })
                   }}
@@ -1989,9 +1997,13 @@ class CustomerProfile extends Component {
                   type='number'
                   value={info.appearancePatentCount}
                   onChange={e => {
+                    let val = e;
+                    if (val.toString().length > 1) {
+                      val = val.toString().replace(/^0+/, '');
+                    }
                     this.setState({
                       info: Object.assign(info, {
-                        appearancePatentCount: e,
+                        appearancePatentCount: val,
                       })
                     })
                   }}
@@ -2003,9 +2015,13 @@ class CustomerProfile extends Component {
                   type='number'
                   value={info.softwareWorksCount}
                   onChange={e => {
+                    let val = e;
+                    if (val.toString().length > 1) {
+                      val = val.toString().replace(/^0+/, '');
+                    }
                     this.setState({
                       info: Object.assign(info, {
-                        softwareWorksCount: e,
+                        softwareWorksCount: val,
                       })
                     })
                   }}
@@ -2031,9 +2047,13 @@ class CustomerProfile extends Component {
                   type='number'
                   value={info.otherCount}
                   onChange={e => {
+                    let val = e;
+                    if (val.toString().length > 1) {
+                      val = val.toString().replace(/^0+/, '');
+                    }
                     this.setState({
                       info: Object.assign(info, {
-                        otherCount: e,
+                        otherCount: val,
                       })
                     })
                   }}
@@ -2135,8 +2155,9 @@ class CustomerProfile extends Component {
             <Button type='primary' onClick={this.update}>确定修改</Button>
           </AtModalAction>
         </AtModal>
+        }
 
-        <AtModal
+        { this.state.isAdd && <AtModal
           isOpened={this.state.isAdd}
           onClose={() => {
             this.setState({
@@ -2241,9 +2262,9 @@ class CustomerProfile extends Component {
             <Button type='primary' onClick={this.add}>保存</Button>
           </AtModalAction>
         </AtModal>
-
+        }
         {/* 新增项目 */}
-        <AtModal
+        {/* <AtModal
           isOpened={this.state.addItemShow}
           onClose={this.handleCloseAddItemDialog}
         >
@@ -2263,7 +2284,7 @@ class CustomerProfile extends Component {
             <Button type='secondary' onClick={this.handleCloseAddItemDialog}>取消</Button>
             <Button type='primary' onClick={this.handleAddItemSave}>保存</Button>
           </AtModalAction>
-        </AtModal>
+        </AtModal> */}
 
         {/* 多选框 */}
         <CheckboxPicker