소스 검색

非公出协单优化

dev01 1 주 전
부모
커밋
2e193d5303
4개의 변경된 파일63개의 추가작업 그리고 16개의 파일을 삭제
  1. 28 3
      src/pages/applyDepart/publicContent.jsx
  2. 28 3
      src/pages/egressDetails/publicContent.jsx
  3. 3 3
      src/pages/mybusiness/index.jsx
  4. 4 7
      src/utils/tools/config.js

+ 28 - 3
src/pages/applyDepart/publicContent.jsx

@@ -65,6 +65,7 @@ class PublicContent extends Component {
       assistTypeName: '',
       assistContentType: '',
       assistContentTypeName: '',
+      assistContent: '',
 
       multiplePickerShow: false,
       multiplePickerType: '',
@@ -186,7 +187,9 @@ class PublicContent extends Component {
       datas = {
         ...datas,
         assistType: this.state.assistType,
-        assistContentTypeType: this.state.assistContentType
+        assistContentType: this.state.assistContentType,
+        // 协单类型内容补充
+        assistContent: this.state.assistContent,
       }
     } else {
       datas = {
@@ -722,7 +725,7 @@ class PublicContent extends Component {
           以地图为中心100米范围为可打卡区域,移动红标只需要拖动地图即可
         </View>
         {
-          [1, 5].indexOf(this.props.enterpriseInfor.type) > -1 &&
+          [0, 5].indexOf(this.props.enterpriseInfor.type) > -1 &&
           <View className="formItems" style={{ alignItems: "center", paddingBottom: 0, marginTop: 10 }}>
             <View className="formNames">技术协单: </View>
             <View className="formValues" style={{ alignItems: "center" }}>
@@ -753,7 +756,7 @@ class PublicContent extends Component {
           </View>
         }
         {
-          [1, 5].indexOf(this.props.enterpriseInfor.type) > -1 &&
+          [0, 5].indexOf(this.props.enterpriseInfor.type) > -1 &&
           <View className="tips">
             请与技术协商后,再发起协单,协单将统计公出成本等
           </View>
@@ -812,6 +815,28 @@ class PublicContent extends Component {
                 <AtIcon value="chevron-right" size="30" color="#bbbbbb" />
               </View>
             </View>
+            { this.state.assistContentType.indexOf('0') > -1 ? (
+              <View className="formItem">
+                <View className="formName">内容说明:</View>
+                <View
+                className="formValue"
+                style={{ paddingTop: "10px", textAlign: "left" }}
+                >
+                <AtTextarea
+                    height={46}
+                    value={this.state.assistContent}
+                    onChange={(v) => {
+                    this.setState({
+                      assistContent: v,
+                    });
+                    }}
+                    count={false}
+                    maxLength={1000}
+                    placeholder="请输入协单内容说明"
+                />
+                </View>
+              </View>
+            ) : null }
           </Fragment>
         ) : null }
         

+ 28 - 3
src/pages/egressDetails/publicContent.jsx

@@ -66,6 +66,7 @@ class PublicContent extends Component {
       assistTypeName: '',
       assistContentType: '',
       assistContentTypeName: '',
+      assistContent: '',
 
       multiplePickerShow: false,
       multiplePickerType: '',
@@ -159,6 +160,7 @@ class PublicContent extends Component {
         assistTypeName,
         assistContentType: this.props.dtails.assistContentType,
         assistContentTypeName,
+        assistContent: this.props.dtails.assistContent,
       });
     }
 
@@ -333,7 +335,8 @@ class PublicContent extends Component {
 
     if(this.props.dtails.type == 5) {
       datas.assistType = this.state.assistType
-      datas.assistContentTypeType = this.state.assistContentType
+      datas.assistContentType = this.state.assistContentType
+      datas.assistContent = this.state.assistContent
     }
   
     for (let key in datas) {
@@ -885,7 +888,7 @@ class PublicContent extends Component {
           )
         }
         {
-          dtails.type === 0 &&
+          [0, 5].indexOf(dtails.type) > -1 &&
           <View className="formItem" style={{ alignItems: "flex-start" }}>
             <View className="formName">技术协单:</View>
             <View className="formValues">
@@ -916,7 +919,7 @@ class PublicContent extends Component {
           </View>
         }
         {
-          dtails.type === 0 &&
+          [0, 5].indexOf(dtails.type) > -1 &&
           <View className="tips">
             请与技术协商后,再发起协单,协单将统计公出成本等
           </View>
@@ -1059,6 +1062,28 @@ class PublicContent extends Component {
                 <AtIcon value="chevron-right" size="30" color="#bbbbbb" />
               </View>
             </View>
+            { this.state.assistContentType.indexOf('0') > -1 ? (
+              <View className="formItem">
+                <View className="formName">内容说明:</View>
+                <View
+                className="formValue"
+                style={{ paddingTop: "10px", textAlign: "left" }}
+                >
+                <AtTextarea
+                    height={46}
+                    value={this.state.assistContent}
+                    onChange={(v) => {
+                    this.setState({
+                      assistContent: v,
+                    });
+                    }}
+                    count={false}
+                    maxLength={1000}
+                    placeholder="请输入协单内容说明"
+                />
+                </View>
+              </View>
+            ) : null }
           </Fragment>
         ) : null }
 

+ 3 - 3
src/pages/mybusiness/index.jsx

@@ -62,10 +62,10 @@ class Examine extends Component {
       isOpen: false,
       coorderPublic: [
         { title: '非公出协单', type: 9 },
-        { title: '公出协单', type: 2 },
-        { title: '全部', type: 4 }],
+        { title: '公出协单', type: 8 },
+        { title: '全部', type: 0 }],
       coorder: [
-        { title: '非公出协单', type: 9 },
+        { title: '非公出协单', type: 10 },
         { title: '协单助手', type: 3 },
         { title: '技术协单', type: 2 },
         { title: '全部', type: 4 }],

+ 4 - 7
src/utils/tools/config.js

@@ -13642,9 +13642,6 @@ export const yearList = [{
 
 // 协单类型
 export const assistTypeList = [{
-  title: '其他',
-  id: '0'
-}, {
   title: '高企认定',
   id: '1'
 }, {
@@ -13674,10 +13671,10 @@ export const assistTypeList = [{
 }]
 
 export const assistContentList = [
-  // {
-  //   title: '其他',
-  //   id: '0'
-  // },
+  {
+    title: '其他',
+    id: '0'
+  },
   {
     title: '会议',
     id: '1'