sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xds
姜玉琦 2024-04-28 00:44:10 +08:00
parent d6ce975a17
commit 72b976a06d
6 changed files with 47 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-ui/src/views/flowable/task/myProcess/detail/detailDrawer.vue
View File

@ -134,10 +134,10 @@
<el-form-item v-if="initData.subDeptSafetyCertificate" label="安全证书">
{{ initData.subDeptSafetyCertificate }}
</el-form-item>
<el-form-item v-if="initData.subDeptCustodian" label="项目负责人">
<el-form-item v-if="initData.subDeptCustodian" label="项目经理">
{{ initData.subDeptCustodian }}
</el-form-item>
<el-form-item v-if="initData.subDeptCustodianCardId" label="负责人身份证">
<el-form-item v-if="initData.subDeptCustodianCardId" label="身份证号">
{{ initData.subDeptCustodianCardId }}
</el-form-item>
<el-form-item v-if="initData.subDeptApproachDate" label="进场时间">

14
ruoyi-ui/src/views/flowable/task/myProcess/editTaskDrawer.vue
View File

@ -96,20 +96,20 @@
placeholder="请输入分包单位安全生产许可证"
/>
</el-form-item>
<el-form-item v-if="fbAptitude" label="项目负责人" prop="subDeptCustodian">
<el-form-item v-if="fbAptitude" label="项目经理" prop="subDeptCustodian">
<el-input
v-model="form.subDeptCustodian"
placeholder="请输入分包单位项目负责人"
placeholder="请输入分包单位项目经理"
/>
</el-form-item>
<el-form-item
v-if="fbAptitude"
label="负责人身份证"
label="身份证号"
prop="subDeptCustodianCardId"
>
<el-input
v-model="form.subDeptCustodianCardId"
placeholder="请输入分包单位负责人身份证号"
placeholder="请输入分包单位项目经理身份证号"
/>
</el-form-item>
<el-form-item v-if="fbAptitude" label="进场时间" prop="subDeptApproachDate">
@ -214,15 +214,15 @@ export default {
},
],
subDeptCustodian: [
{ required: true, message: "请输入分包单位项目负责人", trigger: "blur" },
{ required: true, message: "请输入分包单位项目经理", trigger: "blur" },
{
max: 20,
message: "分包单位项目负责人最多20字",
message: "分包单位项目经理最多20字",
trigger: "blur",
},
],
subDeptCustodianCardId: [
{ required: true, message: "请输入分包单位负责人身份证号", trigger: "blur" },
{ required: true, message: "请输入分包单位项目经理身份证号", trigger: "blur" },
{
pattern: /^[1-9]\d{5}(18|19|20|21|22)?\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}(\d|[Xx])$/,
message: "请输入正确的身份证号",

14
ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue
View File

@ -96,20 +96,20 @@
placeholder="请输入分包单位安全生产许可证"
/>
</el-form-item>
<el-form-item v-if="fbAptitude" label="项目负责人" prop="subDeptCustodian">
<el-form-item v-if="fbAptitude" label="项目经理" prop="subDeptCustodian">
<el-input
v-model="form.subDeptCustodian"
placeholder="请输入分包单位项目负责人"
placeholder="请输入分包单位项目经理"
/>
</el-form-item>
<el-form-item
v-if="fbAptitude"
label="负责人身份证"
label="身份证号"
prop="subDeptCustodianCardId"
>
<el-input
v-model="form.subDeptCustodianCardId"
placeholder="请输入分包单位负责人身份证号"
placeholder="请输入分包单位项目经理身份证号"
/>
</el-form-item>
<el-form-item v-if="fbAptitude" label="进场时间" prop="subDeptApproachDate">
@ -212,15 +212,15 @@ export default {
},
],
subDeptCustodian: [
{ required: true, message: "请输入分包单位项目负责人", trigger: "blur" },
{ required: true, message: "请输入分包单位项目经理", trigger: "blur" },
{
max: 20,
message: "分包单位项目负责人最多20字",
message: "分包单位项目经理最多20字",
trigger: "blur",
},
],
subDeptCustodianCardId: [
{ required: true, message: "请输入分包单位负责人身份证号", trigger: "blur" },
{ required: true, message: "请输入分包单位项目经理身份证号", trigger: "blur" },
{
pattern: /^[1-9]\d{5}(18|19|20|21|22)?\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}(\d|[Xx])$/,
message: "请输入正确的身份证号",

4
ruoyi-ui/src/views/flowable/task/todo/detail/approveDrawer.vue
View File

@ -139,10 +139,10 @@
<el-form-item v-if="initData.subDeptSafetyCertificate" label="安全证书">
{{ initData.subDeptSafetyCertificate }}
</el-form-item>
<el-form-item v-if="initData.subDeptCustodian" label="项目负责人">
<el-form-item v-if="initData.subDeptCustodian" label="项目经理">
{{ initData.subDeptCustodian }}
</el-form-item>
<el-form-item v-if="initData.subDeptCustodianCardId" label="负责人身份证">
<el-form-item v-if="initData.subDeptCustodianCardId" label="身份证号">
{{ initData.subDeptCustodianCardId }}
</el-form-item>
<el-form-item v-if="initData.subDeptApproachDate" label="进场时间">

29
ruoyi-wechat/src/main/java/com/ruoyi/web/common/PublicsController.java 100644
View File

@ -0,0 +1,29 @@
package com.ruoyi.web.common;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.DictUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @version : V1.0
* @ClassName: PublicsController
* @Description: 公共服务
* @Auther: JiangYuQi
* @Date: 2020/7/7 18:03
*/
@RestController
@RequestMapping("/wechat/publics")
public class PublicsController {
/**
* 查询演训类型
* @return
*/
@GetMapping("/v1/getDictCache/{type}")
public AjaxResult queryTrainDataType(@PathVariable("type") String type){
return AjaxResult.success(DictUtils.getDictCache(type));
}
}

1
ruoyi-wechat/src/main/java/com/ruoyi/web/flowable/controller/WcFlowableController.java
View File

@ -307,5 +307,4 @@ public class WcFlowableController extends BaseController {
redisCache.setCacheObject(key, list, 2, TimeUnit.MINUTES);
return success(list);
}
}