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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
z 2026-02-11 10:08:25 +08:00
commit 1253b2a424
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/ProjectOrderController.java
View File

@ -106,7 +106,7 @@ public class ProjectOrderController {
@Transactional(rollbackFor = Exception.class)
public CommonResult<Long> operateProjectOrder(@Valid @RequestBody ProjectOrderSaveReqVO operateReqVO) {
LocalDateTime startTime = LocalDateTime.now();
if ("ALTER".equals(operateReqVO.getActive())) {
if ("ALTER".equals(operateReqVO.getActive()) && operateReqVO.getDeliveryStatus() != 3) {
List<ProjectOrderSubDO> list = operateReqVO.getProjectOrderSubs();
List<ProjectOrderSubDO> updateList = list.stream().filter(o -> o.getId() != null).collect(Collectors.toList());
for (ProjectOrderSubDO projectOrderSubDO : updateList) {

6
mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
View File

@ -399,7 +399,7 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)"
<el-col :span="24">
<el-form-item label="合同号" prop="contractNo">
<el-input
class="!w-250px" :disabled="detailDisabled || priceDisabled || formData.deliveryStatus == 3"
class="!w-250px" :disabled="detailDisabled || priceDisabled"
v-model="formData.contractNo" placeholder="请输入合同号" />
</el-form-item>
</el-col>
@ -509,7 +509,7 @@ class="!w-703px" :disabled="detailDisabled || priceDisabled || formData.delivery
<el-col :span="6">
<el-form-item label="有无合同" prop="hasContract">
<el-radio-group
:disabled="detailDisabled || priceDisabled || formData.deliveryStatus == 3" v-model="formData.hasContract"
:disabled="detailDisabled || priceDisabled" v-model="formData.hasContract"
:class="{ 'alter-class': fieldHasAlter('hasContract') }">
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)"
@ -522,7 +522,7 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)"
<el-col :span="6">
<el-form-item label="有无技术协议" prop="hasTechnologyProtocol">
<el-radio-group
:disabled="detailDisabled || priceDisabled || formData.deliveryStatus == 3" v-model="formData.hasTechnologyProtocol"
:disabled="detailDisabled || priceDisabled" v-model="formData.hasTechnologyProtocol"
:class="{ 'alter-class': fieldHasAlter('hasTechnologyProtocol') }">
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)"