Merge remote-tracking branch 'origin/pet' into pet

api/index.js

@@ -102,8 +102,8 @@ export const getkeyprojectcount = (params) => post("/app/keyprojectcheck/keyProj
 export const getPromiseUnsigned = (params) => post("/app/corppromise/ISSIGN", params); // 获取是否有需要签字的承诺书
 export const getPromiseInfo = (params) => post("/app/corppromise/promise", params); // 获取需要签字的承诺书信息
 export const setPromiseSign = (params) => upload("/app/corppromise/editpeople", params); // 承诺书提交签字
-export const getMyPromiseList = (params) => post("/app/corppromise/promiselist", params); // 获取我的承诺列表
+export const getMyPromiseList = (params) => post("/app/corppromise/promiseV2list", params); // 获取我的承诺列表
-export const getReceivePromiseList = (params) => post("/app/corppromise/receivePromiseList", params); // 获取接收承诺列表
+export const getReceivePromiseList = (params) => post("/app/corppromise/receiveV2PromiseList", params); // 获取接收承诺列表
 export const getPromiseView = (params) => post("/app/corppromise/goEdit", params); // 查看承诺书
 export const setPromiseIsRead = (params) => post("/app/corppromise/editIsRead", params); // 承诺书设置阅读状态
 export const editHiddenIspunish = (params) => post("/app/keyprojectcheck/editHiddenIspunish", params); // 修改隐患信息

pages/key-project-management/safety-environmental-inspection/detail-list.vue

@@ -52,6 +52,7 @@ export default {
   data() {
     return {
       KEYWORDS: '',
+	  CORPINFO_ID: '',
       OUTSOURCED_ID: '',
       pageSize: 10,
       currentPage: 1,
@@ -71,7 +72,8 @@ export default {
     }
   },
   onLoad(e) {
-   this.OUTSOURCED_ID = e.OUTSOURCED_ID
+   this.OUTSOURCED_ID = e.OUTSOURCED_ID,
+   this.CORPINFO_ID = this.$route.query.CORPINFO_ID
   },
   onShow(){
     this.resetList()
@@ -81,6 +83,7 @@ export default {
       let resData = await getKeyProjectsCheckList({
         KEYWORDS: this.KEYWORDS,
         OUTSOURCED_ID: this.OUTSOURCED_ID,
+		CORPINFO_ID: this.CORPINFO_ID,
         showCount: this.pageSize,
         currentPage: this.currentPage,
       });
@@ -99,6 +102,7 @@ export default {
         params: {
           KEYPROJECTCHECK_ID,
           type,
+		  CORPINFO_ID:this.CORPINFO_ID,
           OUTSOURCED_ID:this.OUTSOURCED_ID
         }
       })

pages/key-project-management/safety-environmental-inspection/detail.vue

@@ -356,6 +356,8 @@ export default {
         HIDDENLEVEL: '',
         HIDDENTYPE_NAME: '',
         HIDDENTYPE: '',
+		HIDDENTYPE2_NAME: '',
+		HIDDENTYPE2: '',
         SOURCE: '4',
         CORPINFO_ID: '',
         HIDDENFINDDEPT: '',
@@ -396,6 +398,7 @@ export default {
   async onLoad(event) {
     this.KEYPROJECTCHECK_ID = event.KEYPROJECTCHECK_ID
     this.OUTSOURCED_ID = event.OUTSOURCED_ID
+	
     this.disabled = !(event.type === 'add' || event.type === 'edit');
     if (this.KEYPROJECTCHECK_ID) {
       await this.fnGetKeyProjectsCheckView()
@@ -492,6 +495,14 @@ export default {
       if (list === 'hiddenTypeTreeList') {
         this.hiddenForm.HIDDENTYPE = e[0].id
         this.hiddenForm.HIDDENTYPE_NAME = e[0].name
+		// 获取根节点元素名
+		this.hiddenTypeTreeList.forEach((enode) => {
+			if (JSON.stringify(enode).includes(e[0].id) && JSON.stringify(enode).includes(e[0].name)){
+				// CORPINFO_ID = this.$route.query.CORPINFO_ID,
+				this.hiddenForm.HIDDENTYPE2 = enode.id
+				this.hiddenForm.HIDDENTYPE2_NAME = enode.name
+			}
+		})
       }
       if (list === 'rectificationSiteuserColumns') {
         this.hiddenForm.RECTIFICATIONDEPT = e[0].UNITS_ID
@@ -636,6 +647,8 @@ export default {
           FOREIGN_KEY,
           TYPE: 102,
           CORPINFO_ID: this.userInfo.CORPINFO_ID,
+          // CORPINFO_ID: this.CORPINFO_ID,
+		  
         },
         loading:false
       })

pages/key-project-management/safety-environmental-inspection/list.vue

@@ -101,6 +101,7 @@ export default {
         url: '/pages/key-project-management/safety-environmental-inspection/detail-list',
         params: {
           OUTSOURCED_ID,
+		  CORPINFO_ID: this.CORPINFO_ID
         }
       })
     },

pages/mine/promise/promise.vue

@@ -6,16 +6,71 @@
         itemStyle="height:80upx;padding-bottom:10upx;background-color: #fff;"
         @click="tabsClick"
     ></u-tabs>
+		<view class="container">
+			<u-sticky offset-top="200">
+				<u-button type="primary" text="高级搜索" @click="popupOpen" style="height: 30px;"></u-button>
+			</u-sticky>
+		</view>
+		<u-popup :show="popupShow" mode="right" :overlay="true" customStyle='width: 300px;' :safeAreaInsetTop="true" @close="popupClose" @open="popupOpen">
+			<view>
+				<u-datetime-picker
+							:show="addStartPickBarShow"
+							v-model="addTimeStart"
+							mode="date"
+							@close="addPickBarOnClose('start')"
+							@cancel="addPickBarOnCancel('start')"
+							@confirm="addPickBarOnConfirm"
+					></u-datetime-picker>
+						<u-button @click="addStartPickBarShow = true">起始时间：{{ addTimeStartStr == '' ? '请选择起始时间...' : addTimeStartStr }}</u-button>
+				<u-datetime-picker
+							:show="addEndPickBarShow"
+							v-model="addTimeEnd"
+							mode="date"
+							@close="addPickBarOnClose('end')"
+							@cancel="addPickBarOnCancel('end')"
+							@confirm="addPickBarOnConfirm"
+					></u-datetime-picker>
+						<u-button @click="addEndPickBarShow = true">结束时间：{{ addTimeEndStr == '' ? '请选择结束时间...' : addTimeEndStr }}</u-button>
+					<u-toast ref="uToast"></u-toast>
+				<view class="u-page">
+				        <view class="u-demo-block">
+				            <view class="u-demo-block__content">
+				                <u-row customStyle="margin-bottom: 10px">
+				                    <u-col span="6">
+				                        <view class="demo-layout bg-purple-light">
+											<u-button @click="resetAdvancedParam">重置</u-button>
+										</view>
+				                    </u-col>
+				                    <u-col span="6">
+				                        <view class="demo-layout bg-purple">
+											<u-button @click="advancedSearch">搜索</u-button>
+										</view>
+				                    </u-col>
+				                </u-row>
+				                
+				            </view>
+				        </view>
+				    </view>
+				
+			</view>
+		</u-popup>
     <view class="message_list">
       <u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
         <u-list-item v-for="(item, index) in list" :key="index">
           <view class="message_item arrow" @click="fnNavigator(item)">
             <view class="message_flex">
               <view>
+                <template v-if="item.corppromisType ==='1'"> <!-- 0承诺书1责任状 -->
+                  <view class="fontstyle">发状人：{{ item.coverpeople }}</view>
+                  <view class="fontstyle">受状人：{{ item.NAME }}</view>
+                </template>
+                <template v-else>
                   <view class="fontstyle">被承诺人：{{ item.coverpeople }}</view>
                   <view class="fontstyle">承诺人：{{ item.NAME }}</view>
+                </template>
+
                 <view v-if="item.SIGNTIME != null" class="fontstyle">已签字</view>
-                <view v-else class="fontstyle">未签字</view>
+                <view v-else class="fontstyle_red">未签字</view>
                 <view class="message_time">{{ item.SIGNTIME }}</view>
               </view>
               <view class="font0" v-if="TYPE === '2'">{{ item.ISREAD == '0' ? '待阅' : '已阅' }}</view>
@@ -44,6 +99,13 @@ export default {
       currentPage: 1,
       totalPage: 0,
       list: [],
+	  popupShow: false, // 高级搜索弹窗
+	  addStartPickBarShow: false, // 起始日期选择器
+	  addEndPickBarShow: false, // 结束日期选择器
+	  addTimeStart: Number(new Date()), // 承诺书添加时间-起始
+	  addTimeEnd: Number(new Date()), // 承诺书添加时间-结束
+	  addTimeStartStr: '', // 承诺书添加时间-起始-字符串
+	  addTimeEndStr: '', // 承诺书添加时间-结束-字符串
     }
   },
   computed: {
@@ -60,6 +122,8 @@ export default {
         USER_ID: this.userInfo.USER_ID,
         showCount: this.pageSize,
         currentPage: this.currentPage,
+		ADDSTART: this.addTimeStartStr,
+		ADDEND: this.addTimeEndStr
       })
       this.list = [...this.list, ...resData.varList]
       this.totalPage = resData.page.totalPage
@@ -69,6 +133,8 @@ export default {
         USER_ID: this.userInfo.USER_ID,
         showCount: this.pageSize,
         currentPage: this.currentPage,
+		ADDSTART: this.addTimeStartStr,
+		ADDEND: this.addTimeEndStr
       })
       this.list = [...this.list, ...resData.varList]
     },
@@ -88,6 +154,7 @@ export default {
     },
     tabsClick(e) {
       this.TYPE = e.id
+	  this.resetAllAddTime()
       this.resetList()
     },
     fnNavigator(item) {
@@ -99,7 +166,82 @@ export default {
           TYPE: this.TYPE
         }
       })
+    },
+	// 高级搜索弹窗弹出函数
+	popupOpen() {
+	  this.popupShow = true
+	  
+	},
+	// 高级搜索弹窗关闭函数
+	popupClose() {
+	  this.popupShow = false
+	  
+	},
+	// 高级搜索日期选择器关闭回调
+	addPickBarOnClose(type) {
+		switch (type) {
+			case 'start':
+				this.addStartPickBarShow = false;
+				break;
+			case 'end':
+				this.addEndPickBarShow = false;
+				break;
+			default:
+				this.$refs.uToast.show({message:'日期选择参数错误',duration:1000})
 		}
+	},
+	// 高级搜索日期选择器取消回调
+	addPickBarOnCancel(type) {
+		this.addPickBarOnClose(type)
+	},
+	// 高级搜索日期选择器确认回调
+	addPickBarOnConfirm(value) {
+		// alert(value.value)
+		switch (this.addStartPickBarShow) {
+			case true:
+				// start type
+				this.addTimeStartStr = uni.$u.timeFormat(value.value, 'yyyy-mm-dd')
+				this.addPickBarOnClose('start')
+				break;
+			case false:
+				// end type
+				this.addTimeEndStr = uni.$u.timeFormat(value.value, 'yyyy-mm-dd')
+				this.addPickBarOnClose('end')
+				break;
+			default:
+				this.$refs.uToast.show({message:'日期选择参数错误',duration:1000})
+		}
+	},
+		// 清除高级搜索内的起始日期、结束日期组件绑定的时间属性（时间戳类型）；清除根据时间戳格式化的文本日期
+	resetAllAddTime() {
+		this.addTimeStart = Number(new Date())
+		this.addTimeEnd = Number(new Date())
+		this.addTimeStartStr = ''
+		this.addTimeEndStr = ''
+	},
+	// 重置高级搜索条件
+	resetAdvancedParam() {
+		this.resetAllAddTime()
+		this.resetList()
+	},
+	// 高级搜索
+	advancedSearch(){
+		const toast = uni.$u.toast
+		// 日期合法判定
+		if (this.addTimeStartStr > this.addTimeEndStr){
+				// 包含两种case：case1 开始时间 > 结束时间；case2 开始时间有值，结束时间为空
+			this.$refs.uToast.show({message:'日期不合法',duration:1000})
+			return
+		}
+		if (this.addTimeEndStr != '' && this.addTimeStartStr == ''){
+			// 结束时间有值，开始时间为空
+			this.$refs.uToast.show({message:'日期不合法',duration:1000})
+			return
+		}
+		this.resetList()
+		this.popupClose()
+	}
+	
   }
 }
 </script>
@@ -109,4 +251,24 @@ export default {
   background-color: #f7f9ff;
   height: 100vh;
 }
+.wrap {
+	padding: 12px;
+}
+
+.demo-layout {
+	height: 25px;
+	border-radius: 4px;
+}
+
+.bg-purple {
+	background: #CED7E1;
+}
+
+.bg-purple-light {
+	background: #e5e9f2;
+}
+
+.bg-purple-dark {
+	background: #99a9bf;
+}
 </style>