ykx/jy-safe-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增“保存”按钮，

Browse Source
This commit is contained in:
yunkexin 2026-07-13 15:44:38 +08:00
parent aae9f75c91
commit 7faa266357
7 changed files with 2434 additions and 2394 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pages/apply/subPages/FO/1preShiftMeetingEdit.vue
View File

@ -83,9 +83,9 @@
</view> --> </view> -->
<view style="padding: 10px 16px;display: flex;flex-direction: row;" class="bottom-button"> <view style="padding: 10px 16px;display: flex;flex-direction: row;" class="bottom-button">
<button type="default" @click="submit('Save')" :plain="true" <button @click="submit('Save')" :plain="true"
style="margin-right: 5px;background-color: #fff;color: #3d4b70;width: 50%;height: 40px;display: flex;align-items: center;justify-content: center;font-size: 14px;">保存</button> style="margin-right: 5px;background-color: #fff;color: #3d4b70;width: 50%;height: 40px;display: flex;align-items: center;justify-content: center;font-size: 14px;">保存</button>
<button type="default" @click="submit('SaveAndNotify')" <button @click="submit('SaveAndNotify')"
style="margin-left: 5px;background-color: #3d4b70;color: #fff;width: 50%;height: 40px;display: flex;align-items: center;justify-content: center;font-size: 14px;">提交</button> style="margin-left: 5px;background-color: #3d4b70;color: #fff;width: 50%;height: 40px;display: flex;align-items: center;justify-content: center;font-size: 14px;">提交</button>
</view> </view>
<u-datetime-picker :show="dateTimePickerInfo.showCheckDate" v-model='dateTimePickerInfo.defaultDateTime' @confirm="handleCheckDate" @close="dateTimePickerInfo.showCheckDate = false" <u-datetime-picker :show="dateTimePickerInfo.showCheckDate" v-model='dateTimePickerInfo.defaultDateTime' @confirm="handleCheckDate" @close="dateTimePickerInfo.showCheckDate = false"

52
pages/apply/subPages/FO/4teamActivityEdit.vue
View File

@ -50,16 +50,16 @@
</view> </view>
<u--form labelPosition="left" labelWidth="auto" labelAlign="center" errorType="border-bottom" ref="sForm" class="card" v-if="model.Nav_TeamActivityUser.length!==0"> <u--form labelPosition="left" labelWidth="auto" labelAlign="center" errorType="border-bottom" ref="sForm" class="card" v-if="model.Nav_TeamActivityUser.length!==0">
<!-- <u-collapse :border="false" accordion> --> <!-- <u-collapse :border="false" accordion> -->
<view v-if="!item.IS_DELETED" v-for="(item, index) in model.Nav_TeamActivityUser.filter(i => !i.IS_DELETED)"> <view v-if="!item.IS_DELETED" v-for="(item, index) in model.Nav_TeamActivityUser.filter(i => !i.IS_DELETED)">
<u-form-item :label="(index + 1) + '. ' + item.Nav_User.NAME+' - '+item.Nav_User.CODE" prop="Nav_User.NAME" @click="handleChangeUser(item)"> <u-form-item :label="(index + 1) + '. ' + item.Nav_User.NAME+' - '+item.Nav_User.CODE" prop="Nav_User.NAME" @click="handleChangeUser(item)">
<!-- <view slot="right-icon" class="row-action"></view> --> <!-- <view slot="right-icon" class="row-action"></view> -->
<view slot="right" class="row-action"> <view slot="right" class="row-action">
<view class="action" @click.stop style="display: flex;flex-direction: row;"> <view class="action" @click.stop style="display: flex;flex-direction: row;">
参与：<u-switch v-model="item.ATTEND_STATUS" :activeValue="1" :inactiveValue="0" inactiveColor="rgb(230, 230, 230)" size="20" space="4" @change="changeswitch(item)"></u-switch> 参与：<u-switch v-model="item.ATTEND_STATUS" :activeValue="1" :inactiveValue="0" inactiveColor="rgb(230, 230, 230)" size="20" space="4" @change="changeswitch(item)"></u-switch>
<u-icon @click="handleDelRowBefore(index, item)" class="icon" name="trash" color="#ff4d4f" size="21" style="margin-left: 10px;"></u-icon> <u-icon @click="handleDelRowBefore(index, item)" class="icon" name="trash" color="#ff4d4f" size="21" style="margin-left: 10px;"></u-icon>
</view>
</view> </view>
<!-- <u-form-item label="人员姓名" prop="Nav_User.NAME" borderBottom </view>
<!-- <u-form-item label="人员姓名" prop="Nav_User.NAME" borderBottom
@click="handleChangeUser(item)"> @click="handleChangeUser(item)">
<u--input disabled disabledColor="#fff" v-model="item['Nav_User'].NAME" <u--input disabled disabledColor="#fff" v-model="item['Nav_User'].NAME"
placeholder="请选择人员姓名" border="none" inputAlign="right" fontSize="14px"></u--input> placeholder="请选择人员姓名" border="none" inputAlign="right" fontSize="14px"></u--input>
@ -72,8 +72,8 @@
<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12"> <u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
</u-icon> </u-icon>
</u-form-item> --> </u-form-item> -->
</u-form-item> </u-form-item>
</view> </view>
<!-- </u-collapse> --> <!-- </u-collapse> -->
</u--form> </u--form>
</view> </view>
@ -86,8 +86,10 @@
<query-selector :show="showPopupMainUser" :total="curTotalMainUser" :lists="mainUserLists" :defaultValue="currentOperateMainUser.NAME" @close="handleClosePopupMainUser" @search="handleSearchMainUser" <query-selector :show="showPopupMainUser" :total="curTotalMainUser" :lists="mainUserLists" :defaultValue="currentOperateMainUser.NAME" @close="handleClosePopupMainUser" @search="handleSearchMainUser"
@select="handleSelectedMainUser" /> @select="handleSelectedMainUser" />
<u-picker :show="comPickerInfo.showSheet" :columns="comPickerInfo.columns" @confirm="onConfirmPicker" @close="closePicker" @cancel="closePicker" keyName="NAME"></u-picker> <u-picker :show="comPickerInfo.showSheet" :columns="comPickerInfo.columns" @confirm="onConfirmPicker" @close="closePicker" @cancel="closePicker" keyName="NAME"></u-picker>
<view class="bottom-button"> <view style="padding: 10px 16px;display: flex;flex-direction: row;" class="bottom-button">
<u-button type="primary" @click="submit" v-if='tableKey==1||isAdd==1' color="#3d4b70">提交</u-button> <u-button type="default" @click="submit('Save')" :plain="true" color="#3d4b70" style="margin-right: 5px;">保存</u-button>
<!-- <u-button type="primary" @click="submit" v-if='tableKey==1||isAdd==1' color="#3d4b70">提交</u-button> -->
<u-button type="default" @click="submit('SaveAndNotify')" v-if='tableKey==1||isAdd==1' color="#3d4b70" style="margin-left: 5px;">提交</u-button>
</view> </view>
</view> </view>
</template> </template>
@ -132,9 +134,9 @@
showPopupMainUser: false, showPopupMainUser: false,
model: { model: {
TITLE: "", TITLE: "",
ADDRESS:"", ADDRESS: "",
DURATION:"", DURATION: "",
ACTIVITY_CONTENT:"", ACTIVITY_CONTENT: "",
ACTIVITY_TIME: '', ACTIVITY_TIME: '',
ORG_ID: "", ORG_ID: "",
NOTE_AKER_ID: "", NOTE_AKER_ID: "",
@ -256,8 +258,7 @@
const json = initFilter(orgId, "", "NAME", '', pageIndex) const json = initFilter(orgId, "", "NAME", '', pageIndex)
extendInclude(json, "Nav_Department") extendInclude(json, "Nav_Department")
extendRule(json, 'ENABLE_STATUS', 1, '0') extendRule(json, 'ENABLE_STATUS', 1, '0')
if(orgId === '8b3c41aa-51b1-7ce9-1879-248a038c1b5c') if (orgId === '8b3c41aa-51b1-7ce9-1879-248a038c1b5c') {
{
extendRule(json, 'DEPARTMENT_ID', 1, uni.getStorageSync('appInfo')?.User?.DEPARTMENT_ID) extendRule(json, 'DEPARTMENT_ID', 1, uni.getStorageSync('appInfo')?.User?.DEPARTMENT_ID)
} }
if (val !== 'init') { if (val !== 'init') {
@ -302,8 +303,7 @@
const json = initFilter(orgId, "", "NAME", '', pageIndex) const json = initFilter(orgId, "", "NAME", '', pageIndex)
extendInclude(json, "Nav_Department") extendInclude(json, "Nav_Department")
extendRule(json, 'ENABLE_STATUS', 1, '0') extendRule(json, 'ENABLE_STATUS', 1, '0')
if(orgId === '8b3c41aa-51b1-7ce9-1879-248a038c1b5c') if (orgId === '8b3c41aa-51b1-7ce9-1879-248a038c1b5c') {
{
extendRule(json, 'DEPARTMENT_ID', 1, uni.getStorageSync('appInfo')?.User?.DEPARTMENT_ID) extendRule(json, 'DEPARTMENT_ID', 1, uni.getStorageSync('appInfo')?.User?.DEPARTMENT_ID)
} }
if (val !== 'init') { if (val !== 'init') {
@ -390,8 +390,7 @@
getRequest(json, "/FO/TeamActivity/Get").then(res => { getRequest(json, "/FO/TeamActivity/Get").then(res => {
this.model = res; this.model = res;
if(res.USER_ID == null) if (res.USER_ID == null) {
{
// res.USER_ID = uni.getStorageSync('appInfo').User.ID; // res.USER_ID = uni.getStorageSync('appInfo').User.ID;
res.Nav_MainUser = {}; res.Nav_MainUser = {};
} }
@ -479,7 +478,7 @@
this.showCheckDate = false this.showCheckDate = false
this.model.ACTIVITY_TIME = uni.$u.timeFormat(e.value, 'yyyy-mm-dd') this.model.ACTIVITY_TIME = uni.$u.timeFormat(e.value, 'yyyy-mm-dd')
}, },
submit() { submit(type) {
if (this.model.TITLE == "") { if (this.model.TITLE == "") {
uni.$showMsgFunc('请填写活动主题!', () => {}, 'error', 1000) uni.$showMsgFunc('请填写活动主题!', () => {}, 'error', 1000)
return; return;
@ -521,6 +520,11 @@
item.TEAM_ACTIVITY_ID = this.model.ID; item.TEAM_ACTIVITY_ID = this.model.ID;
} }
}); });
if (type == 'SaveAndNotify') {
this.model.OpType = 0;
} else {
this.model.OpType = 1;
}
const ele = this.$refs const ele = this.$refs
ele['wForm'].validate().then(res => { ele['wForm'].validate().then(res => {
getRequest(this.model, "/FO/FOTeamActivity/FullUpdate").then(res => { getRequest(this.model, "/FO/FOTeamActivity/FullUpdate").then(res => {
@ -600,6 +604,7 @@
background: #edf1fd; background: #edf1fd;
z-index: 999; z-index: 999;
} }
.sub-form-btn { .sub-form-btn {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@ -621,6 +626,7 @@
.sub-form>>>.uni-card { .sub-form>>>.uni-card {
border-radius: 0; border-radius: 0;
} }
.sub-form>>>.u-form-item__body { .sub-form>>>.u-form-item__body {
padding: 15px 0px; padding: 15px 0px;
} }

49
pages/apply/subPages/FO/FO041Edit.vue
View File

@ -9,12 +9,12 @@
</view> </view>
<view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;">基本信息填写</view> <view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;">基本信息填写</view>
<u-form-item label="发起人：" prop="Nav_User.NAME" @click="handleChangeMonitor('Nav_ApplyUser')" borderBottom> <u-form-item label="发起人：" prop="Nav_User.NAME" @click="handleChangeMonitor('Nav_ApplyUser')" borderBottom>
<u--input disabledColor="#fff" v-model="(model.Nav_ApplyUser||{}).NAME" disabled placeholder="请选择发起人" suffixIcon="arrow-down" suffixIconStyle="font-size:12px" fontSize="14px" <u--input disabledColor="#fff" v-model="(model.Nav_ApplyUser||{}).NAME" disabled placeholder="请选择发起人" suffixIcon="arrow-down" suffixIconStyle="font-size:12px" fontSize="14px"
customStyle="margin:0px;display:flex;padding:3px 0px" border="none" inputAlign="right"> customStyle="margin:0px;display:flex;padding:3px 0px" border="none" inputAlign="right">
</u--input> </u--input>
</u-form-item> </u-form-item>
<u-form-item label="发起部门：" prop="Nav_User.NAME" @click="handleChangeMonitor('Nav_ApplyDepartment')" borderBottom> <u-form-item label="发起部门：" prop="Nav_User.NAME" @click="handleChangeMonitor('Nav_ApplyDepartment')" borderBottom>
<u--input disabledColor="#fff" v-model="(model.Nav_ApplyDepartment||{}).NAME" disabled placeholder="请选择发起部门" suffixIcon="arrow-down" suffixIconStyle="font-size:12px" fontSize="14px" <u--input disabledColor="#fff" v-model="(model.Nav_ApplyDepartment||{}).NAME" disabled placeholder="请选择发起部门" suffixIcon="arrow-down" suffixIconStyle="font-size:12px" fontSize="14px"
customStyle="margin:0px;display:flex;padding:3px 0px" border="none" inputAlign="right"> customStyle="margin:0px;display:flex;padding:3px 0px" border="none" inputAlign="right">
</u--input> </u--input>
@ -33,12 +33,12 @@
<u--input disabled disabledColor="#fff" v-model="model.JOB_END_DATE" placeholder="请选择值班结束时间" border="none" inputAlign="right" fontSize="14px"></u--input> <u--input disabled disabledColor="#fff" v-model="model.JOB_END_DATE" placeholder="请选择值班结束时间" border="none" inputAlign="right" fontSize="14px"></u--input>
<u-icon style="margin-left: 4px;" name="arrow-down" size="12"></u-icon> <u-icon style="margin-left: 4px;" name="arrow-down" size="12"></u-icon>
</u-form-item> </u-form-item>
<u-form-item label="班次：" prop="Nav_Class.NAME" @click="handleChangeMonitor('Nav_Class')" borderBottom> <u-form-item label="班次：" prop="Nav_Class.NAME" @click="handleChangeMonitor('Nav_Class')" borderBottom>
<u--input disabledColor="#fff" v-model="(model.Nav_Class||{}).NAME" disabled placeholder="请选择班次" suffixIcon="arrow-down" suffixIconStyle="font-size:12px" fontSize="14px" <u--input disabledColor="#fff" v-model="(model.Nav_Class||{}).NAME" disabled placeholder="请选择班次" suffixIcon="arrow-down" suffixIconStyle="font-size:12px" fontSize="14px"
customStyle="margin:0px;display:flex;padding:3px 0px" border="none" inputAlign="right"> customStyle="margin:0px;display:flex;padding:3px 0px" border="none" inputAlign="right">
</u--input> </u--input>
</u-form-item> </u-form-item>
<u-form-item label="值班领导" @click="handleShowSheet({title: '值班领导', name: 'Nav_Users'})"> <u-form-item label="值班领导" @click="handleShowSheet({title: '值班领导', name: 'Nav_Users'})">
<u-icon name="man-add" size="24" color="#3d9cff" slot="right"></u-icon> <u-icon name="man-add" size="24" color="#3d9cff" slot="right"></u-icon>
</u-form-item> </u-form-item>
<view class="tag-view" v-if="model.Nav_Users"> <view class="tag-view" v-if="model.Nav_Users">
@ -49,7 +49,7 @@
<u-form-item label="交接班地点" prop="LOCATION" borderBottom> <u-form-item label="交接班地点" prop="LOCATION" borderBottom>
<u--input disabledColor="#ffffff" v-model="model.PLACE" border="none" inputAlign="right" fontSize="14px" placeholder="请输入地点"></u--input> <u--input disabledColor="#ffffff" v-model="model.PLACE" border="none" inputAlign="right" fontSize="14px" placeholder="请输入地点"></u--input>
</u-form-item> </u-form-item>
<u-form-item label="接班人" @click="handleShowSheet({title: '接班人', name: 'Nav_AfterUsers'})"> <u-form-item label="接班人" @click="handleShowSheet({title: '接班人', name: 'Nav_AfterUsers'})">
<u-icon name="man-add" size="24" color="#3d9cff" slot="right"></u-icon> <u-icon name="man-add" size="24" color="#3d9cff" slot="right"></u-icon>
</u-form-item> </u-form-item>
<view class="tag-view" v-if="model.Nav_AfterUsers"> <view class="tag-view" v-if="model.Nav_AfterUsers">
@ -92,7 +92,7 @@
<u--input disabled disabledColor="#fff" v-model="item.END_DATE" placeholder="请选择结束时间" border="none" inputAlign="right" fontSize="14px"></u--input> <u--input disabled disabledColor="#fff" v-model="item.END_DATE" placeholder="请选择结束时间" border="none" inputAlign="right" fontSize="14px"></u--input>
<u-icon style="margin-left: 4px;" name="arrow-down" size="12"></u-icon> <u-icon style="margin-left: 4px;" name="arrow-down" size="12"></u-icon>
</u-form-item> </u-form-item>
<u-form-item label="巡视区域" @click="handleShowSheet({title: '巡视区域', name: 'Nav_DetailAreas',itemData:item})"> <u-form-item label="巡视区域" @click="handleShowSheet({title: '巡视区域', name: 'Nav_DetailAreas',itemData:item})">
<u-icon name="man-add" size="24" color="#3d9cff" slot="right"></u-icon> <u-icon name="man-add" size="24" color="#3d9cff" slot="right"></u-icon>
</u-form-item> </u-form-item>
<view class="tag-view" v-if="item.Nav_DetailAreas"> <view class="tag-view" v-if="item.Nav_DetailAreas">
@ -110,7 +110,7 @@
</u-form-item> </u-form-item>
<u--textarea autoHeight v-model="item.MEASURE" placeholder="请输入处置措施" border="surround"></u--textarea> <u--textarea autoHeight v-model="item.MEASURE" placeholder="请输入处置措施" border="surround"></u--textarea>
<u-form-item label="现场责任人：" prop="Nav_User.NAME" @click="handleShowSheet({title: '现场责任人', name: 'Nav_User',itemData:item})" borderBottom> <u-form-item label="现场责任人：" prop="Nav_User.NAME" @click="handleShowSheet({title: '现场责任人', name: 'Nav_User',itemData:item})" borderBottom>
<u--input disabledColor="#fff" v-model="(item.Nav_User||{}).NAME" disabled placeholder="请选择现场责任人" suffixIcon="arrow-down" suffixIconStyle="font-size:12px" fontSize="14px" <u--input disabledColor="#fff" v-model="(item.Nav_User||{}).NAME" disabled placeholder="请选择现场责任人" suffixIcon="arrow-down" suffixIconStyle="font-size:12px" fontSize="14px"
customStyle="margin:0px;display:flex;padding:3px 0px" border="none" inputAlign="right"> customStyle="margin:0px;display:flex;padding:3px 0px" border="none" inputAlign="right">
</u--input> </u--input>
@ -137,9 +137,12 @@
</view> </view>
<view style="padding: 10px 16px;display: flex;flex-direction: row;" v-if="stepsPageList === 1" class="bottom-button"> <view style="padding: 10px 16px;display: flex;flex-direction: column;" v-if="stepsPageList === 1" class="bottom-button">
<u-button type="primary" @click="stepReduce" color="#3d4b70" :plain="true" style="margin-right: 5px;">上一步</u-button> <u-button @click="submit('0')" :plain="true" color="#3d4b70">保存</u-button>
<u-button type="primary" @click="submit" color="#3d4b70" style="margin-left: 5px;">提交</u-button> <view style="display: flex;flex-direction: row;margin-top: 10px;">
<u-button @click="stepReduce" :plain="true" color="#3d4b70" style="margin-right: 5px;">上一步</u-button>
<u-button @click="submit('SaveAndNotify')" color="#3d4b70" style="margin-left: 5px">提交</u-button>
</view>
</view> </view>
<query-selector :multiple="selectorInfo.isMultiple" :show="selectorInfo.showPopup" :title="selectorInfo.title" :lists="selectorInfo.dataLists" :defaultChecked="selectorInfo.defaultChecked" <query-selector :multiple="selectorInfo.isMultiple" :show="selectorInfo.showPopup" :title="selectorInfo.title" :lists="selectorInfo.dataLists" :defaultChecked="selectorInfo.defaultChecked"
@search="handleSearch" @select="handleSelected" @close="selectorInfo.showPopup=false" :total="selectorInfo.totalCount" /> @search="handleSearch" @select="handleSelected" @close="selectorInfo.showPopup=false" :total="selectorInfo.totalCount" />
@ -475,8 +478,8 @@
handleNewCheckArea() { handleNewCheckArea() {
this.model.Nav_Details.push({ this.model.Nav_Details.push({
ID: guid(), ID: guid(),
LEADER_WELL_RECORD_ID:this.model.ID, LEADER_WELL_RECORD_ID: this.model.ID,
ORG_ID:uni.getStorageSync('orgId'), ORG_ID: uni.getStorageSync('orgId'),
START_DATE: '', START_DATE: '',
END_DATE: '', END_DATE: '',
Nav_DetailAreas: [], Nav_DetailAreas: [],
@ -730,22 +733,22 @@
this.dateTimePickerInfo.showCheckDate = false this.dateTimePickerInfo.showCheckDate = false
}, },
submit() { submit(type) {
this.modelEdit = JSON.parse(JSON.stringify(this.model)) this.modelEdit = JSON.parse(JSON.stringify(this.model))
delete this.modelEdit.Nav_ApplyDepartment delete this.modelEdit.Nav_ApplyDepartment
delete this.modelEdit.Nav_ApplyUser delete this.modelEdit.Nav_ApplyUser
delete this.modelEdit.Nav_Class delete this.modelEdit.Nav_Class
delete this.modelEdit.Nav_ProductionUnit delete this.modelEdit.Nav_ProductionUnit
if(this.modelEdit.Nav_Details&&this.modelEdit.Nav_Details.length>0){ if (this.modelEdit.Nav_Details && this.modelEdit.Nav_Details.length > 0) {
this.modelEdit.Nav_Details.map(item => { this.modelEdit.Nav_Details.map(item => {
item.PUBLISH = 'SaveAndNotify' item.PUBLISH = type
delete item.Nav_User delete item.Nav_User
if(item.Nav_DetailAreas&&item.Nav_DetailAreas.length>0){ if (item.Nav_DetailAreas && item.Nav_DetailAreas.length > 0) {
item.Nav_DetailAreas.map(item1=>{ item.Nav_DetailAreas.map(item1 => {
delete item1.Nav_Area delete item1.Nav_Area
}) })
} }
}) })
} }
if (this.TaskID == null || this.TaskID == '') { if (this.TaskID == null || this.TaskID == '') {
@ -756,7 +759,7 @@
if (this.modelEdit.ORG_ID == null || this.modelEdit.ORG_ID == '') if (this.modelEdit.ORG_ID == null || this.modelEdit.ORG_ID == '')
this.modelEdit.ORG_ID = this.ORG_ID this.modelEdit.ORG_ID = this.ORG_ID
this.modelEdit.PUBLISH = 'SaveAndNotify' this.modelEdit.PUBLISH = type;
fullFOLeaderWellRecord(this.modelEdit).then(res => { fullFOLeaderWellRecord(this.modelEdit).then(res => {
if (res) { if (res) {
uni.$showMsgFunc('操作成功!', () => { uni.$showMsgFunc('操作成功!', () => {

16
pages/apply/subPages/FO/jobFireEdit.vue
View File

@ -191,9 +191,12 @@
</view> </view>
<view style="padding: 10px 16px;display: flex;flex-direction: row;" v-if="stepsPageList === 2" class="bottom-button"> <view style="padding: 10px 16px;display: flex;flex-direction: column;" v-if="stepsPageList === 2" class="bottom-button">
<u-button type="primary" @click="stepReduce" color="#3d4b70" :plain="true" style="margin-right: 5px;">上一步</u-button> <u-button @click="submit('0')" :plain="true" color="#3d4b70">保存</u-button>
<u-button type="primary" @click="submit" color="#3d4b70" style="margin-left: 5px;">提交</u-button> <view style="display: flex;flex-direction: row;margin-top: 10px;">
<u-button @click="stepReduce" :plain="true" color="#3d4b70" style="margin-right: 5px;">上一步</u-button>
<u-button @click="submit('SaveAndNotify')" color="#3d4b70" style="margin-left: 5px">提交</u-button>
</view>
</view> </view>
<query-selector :multiple="selectorInfo.isMultiple" :show="selectorInfo.showPopup" :title="selectorInfo.title" :lists="selectorInfo.dataLists" :defaultChecked="selectorInfo.defaultChecked" <query-selector :multiple="selectorInfo.isMultiple" :show="selectorInfo.showPopup" :title="selectorInfo.title" :lists="selectorInfo.dataLists" :defaultChecked="selectorInfo.defaultChecked"
@search="handleSearch" @select="handleSelected" @close="selectorInfo.showPopup=false" :total="selectorInfo.totalCount" /> @search="handleSearch" @select="handleSelected" @close="selectorInfo.showPopup=false" :total="selectorInfo.totalCount" />
@ -921,7 +924,7 @@
this.dateTimePickerInfo.showCheckDate = false this.dateTimePickerInfo.showCheckDate = false
}, },
submit() { submit(type) {
this.modelEdit = JSON.parse(JSON.stringify(this.model)) this.modelEdit = JSON.parse(JSON.stringify(this.model))
delete this.modelEdit.Nav_ApplyDepartment delete this.modelEdit.Nav_ApplyDepartment
delete this.modelEdit.Nav_ApplyUser delete this.modelEdit.Nav_ApplyUser
@ -939,7 +942,7 @@
} }
if (this.modelEdit.Nav_Users && this.modelEdit.Nav_Users.length > 0) { if (this.modelEdit.Nav_Users && this.modelEdit.Nav_Users.length > 0) {
this.modelEdit.Nav_Users.map(item => { this.modelEdit.Nav_Users.map(item => {
item.PUBLISH = 'SaveAndNotify' item.PUBLISH = type
delete item.Nav_Train delete item.Nav_Train
delete item.Nav_User delete item.Nav_User
delete item.Nav_UserType delete item.Nav_UserType
@ -958,8 +961,7 @@
} }
if (this.modelEdit.ORG_ID == null || this.modelEdit.ORG_ID == '') if (this.modelEdit.ORG_ID == null || this.modelEdit.ORG_ID == '')
this.modelEdit.ORG_ID = this.ORG_ID this.modelEdit.ORG_ID = this.ORG_ID
this.modelEdit.PUBLISH = type;
this.modelEdit.PUBLISH = 'SaveAndNotify'
fullFOFireJob(this.modelEdit).then(res => { fullFOFireJob(this.modelEdit).then(res => {
if (res) { if (res) {
uni.$showMsgFunc('操作成功!', () => { uni.$showMsgFunc('操作成功!', () => {

27
pages/apply/subPages/FO/jobFireTenEdit.vue
View File

@ -108,8 +108,8 @@
</u-form-item> </u-form-item>
<u--textarea v-model="item.CONTENT" placeholder="请输入作业流程及安全措施" border="surround"></u--textarea> <u--textarea v-model="item.CONTENT" placeholder="请输入作业流程及安全措施" border="surround"></u--textarea>
<view class="upload-title">附件：</view> <view class="upload-title">附件：</view>
<full-upload v-model="item.Nav_DetailFiles"></full-upload> <full-upload v-model="item.Nav_DetailFiles"></full-upload>
</view> </view>
@ -124,9 +124,12 @@
</view> </view>
<view style="padding: 10px 16px;display: flex;flex-direction: row;" v-if="stepsPageList === 1" class="bottom-button"> <view style="padding: 10px 16px;display: flex;flex-direction: column;" v-if="stepsPageList === 1" class="bottom-button">
<u-button type="primary" @click="stepReduce" color="#3d4b70" :plain="true" style="margin-right: 5px;">上一步</u-button> <u-button @click="submit('Save')" :plain="true" color="#3d4b70">保存</u-button>
<u-button type="primary" @click="submit" color="#3d4b70" style="margin-left: 5px;">提交</u-button> <view style="display: flex;flex-direction: row;margin-top: 10px;">
<u-button type="primary" @click="stepReduce" color="#3d4b70" :plain="true" style="margin-right: 5px;">上一步</u-button>
<u-button type="primary" @click="submit('SaveAndNotify')" color="#3d4b70" style="margin-left: 5px;">提交</u-button>
</view>
</view> </view>
<query-selector :multiple="selectorInfo.isMultiple" :show="selectorInfo.showPopup" :title="selectorInfo.title" :lists="selectorInfo.dataLists" :defaultChecked="selectorInfo.defaultChecked" <query-selector :multiple="selectorInfo.isMultiple" :show="selectorInfo.showPopup" :title="selectorInfo.title" :lists="selectorInfo.dataLists" :defaultChecked="selectorInfo.defaultChecked"
@search="handleSearch" @select="handleSelected" @close="selectorInfo.showPopup=false" :total="selectorInfo.totalCount" /> @search="handleSearch" @select="handleSelected" @close="selectorInfo.showPopup=false" :total="selectorInfo.totalCount" />
@ -770,7 +773,7 @@
this.dateTimePickerInfo.showCheckDate = false this.dateTimePickerInfo.showCheckDate = false
}, },
submit() { submit(type) {
this.modelEdit = JSON.parse(JSON.stringify(this.model)) this.modelEdit = JSON.parse(JSON.stringify(this.model))
delete this.modelEdit.Nav_ApplyDepartment delete this.modelEdit.Nav_ApplyDepartment
delete this.modelEdit.Nav_ApplyUser delete this.modelEdit.Nav_ApplyUser
@ -789,7 +792,11 @@
} }
if (this.modelEdit.Nav_Users && this.modelEdit.Nav_Users.length > 0) { if (this.modelEdit.Nav_Users && this.modelEdit.Nav_Users.length > 0) {
this.modelEdit.Nav_Users.map(item => { this.modelEdit.Nav_Users.map(item => {
item.PUBLISH = 'SaveAndNotify' if (type == 'SaveAndNotify') {
item.PUBLISH = 'SaveAndNotify'
} else {
item.PUBLISH = null
}
delete item.Nav_Train delete item.Nav_Train
delete item.Nav_User delete item.Nav_User
delete item.Nav_UserType delete item.Nav_UserType
@ -809,7 +816,11 @@
if (this.modelEdit.ORG_ID == null || this.modelEdit.ORG_ID == '') if (this.modelEdit.ORG_ID == null || this.modelEdit.ORG_ID == '')
this.modelEdit.ORG_ID = this.ORG_ID this.modelEdit.ORG_ID = this.ORG_ID
this.modelEdit.PUBLISH = 'SaveAndNotify' if (type == 'SaveAndNotify') {
this.modelEdit.PUBLISH = "SaveAndNotify";
} else {
this.modelEdit.PUBLISH = null;
}
fullFOFireJob(this.modelEdit).then(res => { fullFOFireJob(this.modelEdit).then(res => {
if (res) { if (res) {
uni.$showMsgFunc('操作成功!', () => { uni.$showMsgFunc('操作成功!', () => {

27
pages/apply/subPages/FO/jobFireTwoEdit.vue
View File

@ -127,8 +127,8 @@
</u-form-item> </u-form-item>
<u--textarea v-model="item.CONTENT" placeholder="请输入作业流程及安全措施" border="surround"></u--textarea> <u--textarea v-model="item.CONTENT" placeholder="请输入作业流程及安全措施" border="surround"></u--textarea>
<view class="upload-title">附件：</view> <view class="upload-title">附件：</view>
<full-upload v-model="item.Nav_DetailFiles"></full-upload> <full-upload v-model="item.Nav_DetailFiles"></full-upload>
</view> </view>
@ -143,9 +143,12 @@
</view> </view>
<view style="padding: 10px 16px;display: flex;flex-direction: row;" v-if="stepsPageList === 1" class="bottom-button"> <view style="padding: 10px 16px;display: flex;flex-direction: column;" v-if="stepsPageList === 1" class="bottom-button">
<u-button type="primary" @click="stepReduce" color="#3d4b70" :plain="true" style="margin-right: 5px;">上一步</u-button> <u-button @click="submit('Save')" :plain="true" color="#3d4b70">保存</u-button>
<u-button type="primary" @click="submit" color="#3d4b70" style="margin-left: 5px;">提交</u-button> <view style="display: flex;flex-direction: row;margin-top: 10px;">
<u-button type="primary" @click="stepReduce" color="#3d4b70" :plain="true" style="margin-right: 5px;">上一步</u-button>
<u-button type="primary" @click="submit('SaveAndNotify')" color="#3d4b70" style="margin-left: 5px;">提交</u-button>
</view>
</view> </view>
<query-selector :multiple="selectorInfo.isMultiple" :show="selectorInfo.showPopup" :title="selectorInfo.title" :lists="selectorInfo.dataLists" :defaultChecked="selectorInfo.defaultChecked" <query-selector :multiple="selectorInfo.isMultiple" :show="selectorInfo.showPopup" :title="selectorInfo.title" :lists="selectorInfo.dataLists" :defaultChecked="selectorInfo.defaultChecked"
@ -880,7 +883,7 @@
this.dateTimePickerInfo.showCheckDate = false this.dateTimePickerInfo.showCheckDate = false
}, },
submit() { submit(type) {
const isBlank = (value) => { const isBlank = (value) => {
return typeof value !== 'string' || value.trim() === ''; return typeof value !== 'string' || value.trim() === '';
}; };
@ -906,7 +909,11 @@
} }
if (this.modelEdit.Nav_Users && this.modelEdit.Nav_Users.length > 0) { if (this.modelEdit.Nav_Users && this.modelEdit.Nav_Users.length > 0) {
this.modelEdit.Nav_Users.map(item => { this.modelEdit.Nav_Users.map(item => {
item.PUBLISH = 'SaveAndNotify' if (type == 'SaveAndNotify') {
item.PUBLISH = 'SaveAndNotify'
} else {
item.PUBLISH = null
}
delete item.Nav_Train delete item.Nav_Train
delete item.Nav_User delete item.Nav_User
delete item.Nav_UserType delete item.Nav_UserType
@ -926,7 +933,11 @@
if (this.modelEdit.ORG_ID == null || this.modelEdit.ORG_ID == '') if (this.modelEdit.ORG_ID == null || this.modelEdit.ORG_ID == '')
this.modelEdit.ORG_ID = this.ORG_ID this.modelEdit.ORG_ID = this.ORG_ID
this.modelEdit.PUBLISH = 'SaveAndNotify' if (type == 'SaveAndNotify') {
this.modelEdit.PUBLISH = "SaveAndNotify";
} else {
this.modelEdit.PUBLISH = null;
}
fullFOFireJob(this.modelEdit).then(res => { fullFOFireJob(this.modelEdit).then(res => {
if (res) { if (res) {
uni.$showMsgFunc('操作成功!', () => { uni.$showMsgFunc('操作成功!', () => {

25
pages/apply/subPages/FO2/jobEdit.vue
View File

@ -270,11 +270,13 @@
</u--form> </u--form>
</view> </view>
</view> </view>
<view style="padding: 10px 16px;display: flex;flex-direction: row;" class="bottom-button" v-if="stepsPage === 4"> <view style="padding: 10px 16px;display: flex;flex-direction: column;" class="bottom-button" v-if="stepsPage === 4">
<button type="default" @click="stepReduceTwo" :plain="true" <u-button @click="stepSubmit('Save')" :plain="true" color="#3d4b70">保存</u-button>
style="margin-right: 5px;background-color: #fff;color: #3d4b70;width: 50%;height: 40px;display: flex;align-items: center;justify-content: center;font-size: 14px;">上一步</button> <view style="display: flex;flex-direction: row;margin-top: 10px;">
<button type="default" @click="stepSubmit" <u-button @click="stepReduceTwo" :plain="true" color="#3d4b70" style="margin-right: 5px;">上一步</u-button>
style="margin-left: 5px;background-color: #3d4b70;color: #fff;width: 50%;height: 40px;display: flex;align-items: center;justify-content: center;font-size: 14px;">提交</button> <u-button @click="stepSubmit('SaveAndNotify')" color="#3d4b70" style="margin-left: 5px">提交</u-button>
</view>
</view> </view>
<u-modal :show="showDelModalIndex >= 0" @confirm="confirmDel" @cancel="cacelDel" :showCancelButton="true" title="确认删除？"></u-modal> <u-modal :show="showDelModalIndex >= 0" @confirm="confirmDel" @cancel="cacelDel" :showCancelButton="true" title="确认删除？"></u-modal>
<u-modal :show="showDelModalDetail >= 0" @confirm="confirmDelDetail" @cancel="cacelDelDetail" :showCancelButton="true" title="确认删除？"></u-modal> <u-modal :show="showDelModalDetail >= 0" @confirm="confirmDelDetail" @cancel="cacelDelDetail" :showCancelButton="true" title="确认删除？"></u-modal>
@ -364,7 +366,7 @@
Nav_Department: { Nav_Department: {
NAME: '' NAME: ''
}, },
Nav_Area:{ Nav_Area: {
NAME: '' NAME: ''
}, },
// Nav_ApplyUser: { // Nav_ApplyUser: {
@ -1272,7 +1274,7 @@
formIndex: undefined formIndex: undefined
} }
}, },
stepSubmit() { stepSubmit(type) {
this.numC = 0; this.numC = 0;
this.dataModel.Nav_DealMeasures.map((item) => { this.dataModel.Nav_DealMeasures.map((item) => {
if (item.NAME == '') { if (item.NAME == '') {
@ -1285,7 +1287,7 @@
uni.$showErrorInfo('添加作业后处理措施信息不能为空') uni.$showErrorInfo('添加作业后处理措施信息不能为空')
} else { } else {
this.modelEdit = JSON.parse(JSON.stringify(this.dataModel)) this.modelEdit = JSON.parse(JSON.stringify(this.dataModel))
this.modelEdit.PUBLISH = "SaveAndNotify";
if (this.TaskID !== null) { if (this.TaskID !== null) {
this.modelEdit.TaskID = this.TaskID; this.modelEdit.TaskID = this.TaskID;
} }
@ -1300,7 +1302,12 @@
} }
} }
delete this.modelEdit.Nav_Department delete this.modelEdit.Nav_Department
delete this.modelEdit.Nav_Area delete this.modelEdit.Nav_Area
if (type == 'SaveAndNotify') {
this.modelEdit.PUBLISH = "SaveAndNotify";
} else {
this.modelEdit.PUBLISH = null;
}
saveJobRecord(this.modelEdit).then(res => { saveJobRecord(this.modelEdit).then(res => {
uni.$showMsgFunc('操作成功!', () => { uni.$showMsgFunc('操作成功!', () => {
// if (this.tableKey == null || this.tableKey == 0) { // if (this.tableKey == null || this.tableKey == 0) {