Merge branch 'master' of http://47.122.43.22:3000/ykx/lm-safe-app

manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "双控安全Beta",    //正式：双控安全    测试：双控安全Beta
+    "name" : "双控安全Beta", //正式：双控安全    测试：双控安全Beta
-    "appid" : "__UNI__713D200",    //正式：__UNI__A6AA052    测试：__UNI__713D200
+    "appid" : "__UNI__713D200", //正式：__UNI__A6AA052    测试：__UNI__713D200
     "description" : "连锰矿山安全app",
-    "versionName" : "1.0.0",      //正式下载使用后版本号升级1.0.0->1.0.01
+    "versionName" : "1.0.02", //正式下载使用后版本号升级1.0.0->1.0.01
-    "versionCode" : "100",
+    "versionCode" : "1002",
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/apply/subPages/BS/plan.vue

@@ -179,6 +179,12 @@
 											border="surround"></u--textarea>
 									</u-form-item> -->
 
+									<u-form-item borderBottom style="text-align: center;">
+										<button type="primary" class="btnSubDel"
+											style="width: 35%; background-color: red;"
+											v-if='(isDIY||(isLoadOK && tableKey === "1"))'
+											@click.stop="DetailDel(item)">删除</button>
+									</u-form-item>
 								</uni-collapse-item>
 							</uni-card>
 						</uni-collapse>
@@ -199,7 +205,12 @@
 			@search="handleSearch" @select="handleSelected" @close="selectorInfo.showPopup=false" />
 
 		<view class="bottom-button">
-			<button type="primary" v-if='(isDIY||(isLoadOK && tableKey === "1"))' @click="FullCheckUpdate">提交</button>
+			<button type="primary"
+				style="background-color: #f7f7f7;color: black;width: 43%;float: left; margin-right: 10px;"
+				v-if='(isDIY||(isLoadOK && tableKey === "1"))' @click="btnCancel">取消</button>
+			<button type="primary" style="width: 43%; float: left;" v-if='(isDIY||(isLoadOK && tableKey === "1"))'
+				@click="FullCheckUpdate">提交</button>
+
 		</view>
 
 	</view>
@@ -220,6 +231,7 @@
 	import {
 		GetInfo,
 		FullUpdateBS032,
+		Cancel,
 		CheckTypeOrderPaged,
 		CheckTypeLevelOrderPaged,
 		OrderPagedAreaMineType,
@@ -296,6 +308,7 @@
 					//操作需要同时操作 Nav_ListSafeCheckDetailShow
 					Nav_ListSafeCheckDetail: [{
 						SAFE_CHECK_ID: '',
+						CHECK_CONTENTS_ID: '',
 						ROW_NO: '',
 						CHECKRESULT: 0,
 						Nav_CheckArea: {
@@ -359,6 +372,7 @@
 				//供显示 类似 懒加载
 				Nav_ListSafeCheckDetailShow: [{
 					SAFE_CHECK_ID: '',
+					CHECK_CONTENTS_ID: '',
 					ROW_NO: '',
 					CHECKRESULT: 0,
 					Nav_CheckArea: {
@@ -416,6 +430,7 @@
 					ROW_NO: ROW_NO,
 					CHECKRESULT: 0,
 					SAFE_CHECK_ID: this.model.ID,
+					CHECK_CONTENTS_ID: '',
 					Nav_CheckArea: {
 						NAME: ''
 					},
@@ -430,8 +445,9 @@
 					Nav_ListCheckDetailUser: []
 				}
 				this.model.Nav_ListSafeCheckDetail.unshift(modelAdd)
-				this.Nav_ListSafeCheckDetailShow.unshift(modelAdd)
+				// this.Nav_ListSafeCheckDetailShow.unshift(modelAdd)
-				// this.$forceUpdate()
+				this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail
+				this.indexShow = ROW_NO
 			},
 
 			//手动删除信息 编号修改
@@ -485,6 +501,46 @@
 			handleTab(t) {
 				this.currentTab = t
 			},
+			btnCancel() {
+				var that = this
+				uni.showModal({
+					title: '提示',
+					content: '',
+					editable: true,
+					placeholderText: '请输入取消原因',
+					success: function(res) {
+						if (res.confirm) {
+							if (res.content == null || res.content.length < 1) {
+								uni.$showErrorInfo("取消原因不能为空")
+								return
+							}
+							let json = initFilter(that.model.ORG_ID, that.model.ID, null, null, null, that
+								.TaskID, res.content);
+							Cancel(json).then(res => {
+								uni.$showMsgFunc('操作成功!', () => {
+									uni.navigateBack()
+								}, 'success', 1000)
+							})
+						}
+					}
+				})
+
+
+				// Cancel
+				// { record, onCancel, data, dispatch }
+				//    let json = initFilter(record.ORG_ID, record.ID, null, null, null, data.TaskID);
+				//    dispatch({
+				//      type: 'app/getDataByPost',
+				//      url: 'BS/BSSafeCheck/Cancel',
+				//      payload: json,
+				//      onlyData: false,
+				//      onComplete: (ret) => {
+				//        if (ret.IsSuccessful == true) {
+				//          message.success('执行成功', null, onCancel())
+				//        }
+				//      }
+				//    })
+			},
 			FullCheckUpdate() {
 				const ele = this.$refs
 				this.modelEdit = JSON.parse(JSON.stringify(this.model))
@@ -969,7 +1025,7 @@
 					defaultChecked = []
 				if (dataSelect.length) {
 					this.selectorInfo = {
-						itemData: p.itemData,
+						itemData:p.itemData!=undefined ?p.itemData: this.selectorInfo.itemData,//itemData: p.itemData,  搜索的时候  p.itemData为空  赋值修改 为 她自己本身 this.selectorInfo.itemData
 						isMultiple: this.selectorInfo.isMultiple,
 						showPopup: true,
 						title: p.title,
@@ -1187,8 +1243,7 @@
 						if (this.total > 10) {
 							this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail.slice(0, 10)
 						} else {
-							this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail.slice(0, this
+							this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail.slice(0, this.total)
-								.total)
 						}
 					})
 				}

pages/apply/subPages/BS/riskSumbit.vue

@@ -97,8 +97,8 @@
 									</u-form-item> -->
 
 									<u-form-item label="备注" prop="REMARK" borderBottom>
-										<u--input disabled disabledColor="#fff" placeholder='备注'  border="none" v-model="item.REMARK"
+										<u--input disabled disabledColor="#fff" placeholder='备注' border="none"
-											inputAlign="right"></u--input>
+											v-model="item.REMARK" inputAlign="right"></u--input>
 									</u-form-item>
 									<view class="upload-title">附件</view>
 									<full-upload v-model="item.Nav_Files" :isShowBtn='true'
@@ -202,6 +202,7 @@
 
 	import {
 		OrderPagedUseful2,
+		OrderPagedUser,
 		GetDpartMentNameHeader
 	} from '../../../../services/common'
 
@@ -581,7 +582,17 @@
 				if (val) {
 					extendRule(json, 'NAME', 9, val);
 				}
-				if (this.selectorInfo.name == 'user' || this.selectorInfo.name == 'userDetailer') {
+				if (this.selectorInfo.name == 'user') {
+					OrderPagedUser(json).then(res => {
+						this.selectorInfo.dataLists = res.map(i => {
+							return {
+								...i,
+								name: i.NAME,
+								code: i.CODE
+							}
+						})
+					})
+				} else if (this.selectorInfo.name == 'userDetailer') {
 					OrderPagedUseful2(json).then(res => {
 						if (res.IsSuccessful) {
 							this.selectorInfo.dataLists = res.Data.map(i => {
@@ -631,7 +642,8 @@
 							//CHECK_DETAIL_ID => RISK_SUBMIT_CONTENT_ID
 							listReason.push({
 								ID: guid(),
-								RISK_SUBMIT_CONTENT_ID: this.model.Nav_ListRiskSubmitContent[this.selectorInfo
+								RISK_SUBMIT_CONTENT_ID: this.model.Nav_ListRiskSubmitContent[this
+									.selectorInfo
 									.index].ID,
 								RISK_REASON_ID: item.ID,
 								ORG_ID: item.ORG_ID,

pages/apply/subPages/BS/safeCheckAudit.vue

@@ -64,7 +64,9 @@
 						<uni-collapse :border="false" accordion>
 							<uni-card style="margin-bottom: 16px;" margin="0" spacing="0" :is-shadow="false"
 								v-for="(item, index) in model.Nav_ListSafeCheckDetail">
-								<uni-collapse-item :title="index + 1 + '. ' + item.CHECKCONTENT">
+								<uni-collapse-item :thumb='item.QUESTION_LEVEL==null||item.QUESTION_LEVEL==0 ?null:"../../../../static/warm.png"'
+									:title="index + 1 + '. ' + item.CHECKCONTENT">
+									<!-- :style="item.QUESTION_LEVEL==null||item.QUESTION_LEVEL==0 ?'background-color: white':'background-color:pink'" -->
 									<u-form-item label="检查项目" prop="Nav_CheckProject.NAME" borderBottom>
 										<u--input disabled disabledColor="#fff" v-model="item.Nav_CheckProject.NAME"
 											border="none" inputAlign="right"></u--input>
@@ -109,8 +111,8 @@
 											inputAlign="right"></u--input>
 									</u-form-item>
 									<u-form-item label="备注" prop="REMARK" borderBottom>
-										<u--input disabled disabledColor="#fff" placeholder='备注'  border="none" v-model="item.REMARK"
+										<u--input disabled disabledColor="#fff" placeholder='备注' border="none"
-											inputAlign="right"></u--input>
+											v-model="item.REMARK" inputAlign="right"></u--input>
 									</u-form-item>
 									<view class="upload-title">附件</view>
 									<full-upload :value="item.Nav_Files" :isShowBtn='false'></full-upload>

pages/apply/subPages/BS/safeCheckSign.vue

@@ -151,6 +151,10 @@
 										<u--input disabledColor="#fff" v-model="item.listCheckDetailReason"
 											border="none" inputAlign="right"></u--input>
 									</u-form-item>
+									<u-form-item label="备注" prop="REMARK" borderBottom>
+										<u--input disabledColor="#fff" placeholder='备注' v-model="item.REMARK"
+											inputAlign="right"></u--input>
+									</u-form-item>
 									<view class="upload-title">附件</view>
 									<full-upload v-model="item.Nav_Files" :isShowBtn=item.ISAUTOLOAD
 										:listProp='listPropSubUpload'

services/apply/subPages/BS/safeCheck.js

@@ -185,6 +185,18 @@ export function FullUpdateBS032(params) {
 	})
 }
 
+//检查任务制定取消 
+export function Cancel(params) {
+	return new Promise((resolve, reject) => {
+		request.post("/BS/BSSafeCheck/Cancel", params).then((result) => {
+			if (result.IsSuccessful) {
+				resolve(result.Data);
+			}
+		}).catch((error) => {
+			reject(error)
+		})
+	})
+}
 
 //获取检查类型
 export function CheckTypeOrderPaged(params) {

services/common.js

@@ -74,6 +74,18 @@ export function OrderPagedUseful2(params) {
 	})
 }
 
+//未删除 不包含 admin
+export function OrderPagedUser(params) {
+	return new Promise((resolve, reject) => {
+		request.post("/FM/User/OrderPaged", params).then((result) => {
+			if (result.IsSuccessful) {
+				resolve(result.Data);
+			}
+		}).catch((error) => {
+			reject(error);
+		})
+	})
+}
 
 //下拉选择隐患上报  整改实施单位
 export function GetDpartMentNameHeader(params) {