licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

按新要求修改

Browse Source
This commit is contained in:
Ledo 2025-06-05 17:51:58 +08:00
parent 4dadedc6a6
commit 74db1306cd
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/detail.vue
View File

@ -201,7 +201,7 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PLAN_STATUS)" :key="dict
<el-col :span="6" > <el-col :span="6" >
<el-button v-if="formData.isOverProcess == null || formData.isOverProcess == 0" style="margin-left: 10%;" type="warning" @click="openDelay">延期</el-button> <el-button v-if="formData.isOverProcess == null || formData.isOverProcess == 0" style="margin-left: 10%;" type="warning" @click="openDelay">延期</el-button>
</el-col> </el-col>
<el-col :span="12" v-if="delayDialog || formData.isDelay"> <el-col :span="12">
<el-form-item label="延期原因" prop="delayReason"> <el-form-item label="延期原因" prop="delayReason">
<el-input <el-input
v-model="formData.delayReason" v-model="formData.delayReason"
@ -209,7 +209,7 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PLAN_STATUS)" :key="dict
:disabled="!delayDialog" :disabled="!delayDialog"
@blur="(e) => delaySubmit(e)" @blur="(e) => delaySubmit(e)"
type="textarea" type="textarea"
placeholder="延期原因" placeholder="输入延期原因后，鼠标点击空白区域自动保存。"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -256,21 +256,21 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PLAN_STATUS)" :key="dict
<el-form ref="processDesignProgressFormRef" :model="formData.processDesignProgressList" :rules="subFormRules" v-loading="subFormLoading" label-width="0"> <el-form ref="processDesignProgressFormRef" :model="formData.processDesignProgressList" :rules="subFormRules" v-loading="subFormLoading" label-width="0">
<el-table :data="formData.processDesignProgressList" class="hl-table"> <el-table :data="formData.processDesignProgressList" class="hl-table">
<el-table-column label="序号" align="center" type="index" width="80" fixed /> <el-table-column label="序号" align="center" type="index" width="80" fixed />
<el-table-column label="开始时间" align="center" prop="beginTime" :formatter="dateFormatter" min-width="200"> <el-table-column label="开始时间" align="center" prop="beginTime" :formatter="dateFormatter" min-width="230">
<template #header>开始时间</template> <template #header>开始时间</template>
<template #default="{ row, $index }"> <template #default="{ row, $index }">
<el-form-item :prop="`${$index}.beginTime`" class="mb-0px!"> <el-form-item :prop="`${$index}.beginTime`" class="mb-0px!">
<!-- <el-input-number min="0" max="100" class="!w-240px" :disabled="detailDisabled || row.id" v-model="row.progress" placeholder="请输入进度百分比" @change="verify1($index)"/>--> <!-- <el-input-number min="0" max="100" class="!w-240px" :disabled="detailDisabled || row.id" v-model="row.progress" placeholder="请输入进度百分比" @change="verify1($index)"/>-->
<el-date-picker :disabled-date="(date) => disabledDate1(date, row)" @change="(e) => beginTimeChange(e,row)" :disabled=" row.isOver == 1 || formData.isOverProcess == 1" :formatter="dateFormatter" v-model="row.beginTime" type="datetime" placeholder="选择开始日期"/> <el-date-picker class="!w-230px" :disabled-date="(date) => disabledDate1(date, row)" @change="(e) => beginTimeChange(e,row)" :disabled=" row.isOver == 1 || formData.isOverProcess == 1" :formatter="dateFormatter" v-model="row.beginTime" type="datetime" placeholder="选择开始日期"/>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="结束时间" align="center" prop="endTime" :formatter="dateFormatter" min-width="200"> <el-table-column label="结束时间" align="center" prop="endTime" :formatter="dateFormatter" min-width="230">
<template #header>结束时间</template> <template #header>结束时间</template>
<template #default="{ row, $index }"> <template #default="{ row, $index }">
<el-form-item :prop="`${$index}.endTime`" class="mb-0px!"> <el-form-item :prop="`${$index}.endTime`" class="mb-0px!">
<!-- <el-input-number min="0" max="100" class="!w-240px" :disabled="detailDisabled || row.id" v-model="row.progress" placeholder="请输入进度百分比" @change="verify1($index)"/>--> <!-- <el-input-number min="0" max="100" class="!w-240px" :disabled="detailDisabled || row.id" v-model="row.progress" placeholder="请输入进度百分比" @change="verify1($index)"/>-->
<el-date-picker :disabled-date="(date) => disabledDate(date, row)" @change="(e) => endTimeChange(e,row)" :disabled=" row.isOver == 1 || formData.isOverProcess == 1" :formatter="dateFormatter" v-model="row.endTime" type="datetime" placeholder="选择结束日期"/> <el-date-picker class="!w-230px" :disabled-date="(date) => disabledDate(date, row)" @change="(e) => endTimeChange(e,row)" :disabled=" row.isOver == 1 || formData.isOverProcess == 1" :formatter="dateFormatter" v-model="row.endTime" type="datetime" placeholder="选择结束日期"/>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>

4
mes-ui/mini-app/src/pages/moJuSheJiReport/moJuSheJiReport-detail.vue
View File

@ -260,7 +260,9 @@
}) })
row.isOver = 1; row.isOver = 1;
popup.value?.close()
await submitForm('SAVE', 'OVER'); await submitForm('SAVE', 'OVER');
//更新一下这条数据的状态 //更新一下这条数据的状态
} }
const handOver = () => { const handOver = () => {
@ -585,7 +587,7 @@
</view> </view>
</template> </template>
<view class="loading-text" v-else>加载中..</view> <view class="loading-text" v-else>加载中..</view>
<uni-popup class="popup" ref="popup" :show="showPopup" type="bottom" background-color="#fff"> <uni-popup class="popup" ref="popup" :mask-click="false" type="bottom" background-color="#fff">
<view class="title"> <view class="title">
<view class="text">填写信息</view> <view class="text">填写信息</view>
<!-- <view class="close" @click="handleClose">X</view> --> <!-- <view class="close" @click="handleClose">X</view> -->