yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

销售合同列表修改

Browse Source
product
杨世强 1 year ago
parent b4ae93d8d8
commit bb0d2a58af
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File

2
SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java
Unescape View File

@ -823,7 +823,7 @@ public class ContractFileServiceImpl extends ServiceImpl<ContractFileMapper, Con
int contractFileNum = 0; int contractFileNum = 0;
QueryWrapper<ContractFileEntity> contractFileQueryWrapper = new QueryWrapper<>(); QueryWrapper<ContractFileEntity> contractFileQueryWrapper = new QueryWrapper<>();
contractFileQueryWrapper.eq("a.delete_mark","0"); contractFileQueryWrapper.eq("a.delete_mark","0");
contractFileQueryWrapper.lambda().eq(ContractFileEntity::getContractType,"0"); contractFileQueryWrapper.lambda().eq(ContractFileEntity::getContractType,"1");
int contract_item0Num = 0; int contract_item0Num = 0;
QueryWrapper<Contract_item0Entity> contract_item0QueryWrapper = new QueryWrapper<>(); QueryWrapper<Contract_item0Entity> contract_item0QueryWrapper = new QueryWrapper<>();
int contract_item1Num = 0; int contract_item1Num = 0;

6
SC-boot/linkage-scm/src/main/resources/mapper/contract/ContractFileMapper.xml
Unescape View File

@ -23,9 +23,6 @@
<if test="contractFilePagination.name != null and contractFilePagination.name != ''"> <if test="contractFilePagination.name != null and contractFilePagination.name != ''">
and a.name LIKE CONCAT('%',#{contractFilePagination.name},'%') and a.name LIKE CONCAT('%',#{contractFilePagination.name},'%')
</if> </if>
<!-- <if test="contractFilePagination.contractType != null and contractFilePagination.contractType != ''">-->
<!-- and a.contract_type = #{contractFilePagination.contractType}-->
<!-- </if>-->
GROUP BY a.id GROUP BY a.id
<if test="contractFilePagination.sidx != null and contractFilePagination.sidx != ''"> <if test="contractFilePagination.sidx != null and contractFilePagination.sidx != ''">
ORDER BY ${contractFilePagination.sidx} ${contractFilePagination.sort} ORDER BY ${contractFilePagination.sidx} ${contractFilePagination.sort}
@ -54,9 +51,6 @@
<if test="contractFilePagination.name != null and contractFilePagination.name != ''"> <if test="contractFilePagination.name != null and contractFilePagination.name != ''">
and a.name LIKE CONCAT('%',#{contractFilePagination.name},'%') and a.name LIKE CONCAT('%',#{contractFilePagination.name},'%')
</if> </if>
<!-- <if test="contractFilePagination.contractType != null and contractFilePagination.contractType != ''">-->
<!-- and a.contract_type = #{contractFilePagination.contractType}-->
<!-- </if>-->
GROUP BY a.id GROUP BY a.id
<if test="contractFilePagination.sidx != null and contractFilePagination.sidx != ''"> <if test="contractFilePagination.sidx != null and contractFilePagination.sidx != ''">
ORDER BY ${contractFilePagination.sidx} ${contractFilePagination.sort} ORDER BY ${contractFilePagination.sidx} ${contractFilePagination.sort}

2
SC-web/src/views/scm/basicInformation/tradeupload/Form3.vue
Unescape View File

@ -185,7 +185,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="6">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="dataForm.remark" placeholder="请输入备注信息" clearable <el-input v-model="dataForm.remark" placeholder="请输入备注信息" clearable
:style='{"width":"100%"}'> :style='{"width":"100%"}'>

Write Preview
Loading…
Cancel
Save