diff --git a/.env.development b/.env.development index d5b9e22..53e8c6e 100644 --- a/.env.development +++ b/.env.development @@ -5,8 +5,8 @@ VUE_APP_TITLE = 太仓资产管理系统 ENV = 'development' # 若依管理系统/开发环境 -VUE_APP_BASE_API = 'http://192.168.0.115:9115' +VUE_APP_BASE_API = 'http://192.168.0.108:9115' # VUE_APP_BASE_API = 'http://39.101.188.84:9115' # 路由懒加载 -VUE_CLI_BABEL_TRANSPILE_MODULES = true +VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/src/api/renwuApi/index.js b/src/api/renwuApi/index.js index c969cc1..20c41dc 100644 --- a/src/api/renwuApi/index.js +++ b/src/api/renwuApi/index.js @@ -78,4 +78,105 @@ export function addassetTaskadd(data) { method: "get", params, }) - } \ No newline at end of file + } +//小程序详情 + export function assetTaskminitaskSh(params) { + return request({ + url: `/unit/assetTask/minitaskSh`, + method: "get", + params, + }) + } + + //公众号资产任务审核详情信息 + export function assetTaskofficetaskSh(params) { + return request({ + url: `/unit/assetTask/officetaskSh`, + method: "get", + params, + }) + } + //移动应用程序资产 + export function assetTaskapptaskSh(params) { + return request({ + url: `/unit/assetTask/apptaskSh`, + method: "get", + params, + }) + } + + //电子邮件资产任务审核详情信息 + export function assetTaskemailtaskSh(params) { + return request({ + url: `/unit/assetTask/emailtaskSh`, + method: "get", + params, + }) + } + + //小程序审核报废 + export function assetTaskxcxzc(data) { + return request({ + url: `/unit/assetTask/xcxzc`, + method: "post", + data, + }) + } + //公众号审核报废 + export function assetTaskgzhzc(data) { + return request({ + url: `/unit/assetTask/gzhzc`, + method: "post", + data, + }) + } + + //电子邮件审核报废 + export function assetTaskemailzc(data) { + return request({ + url: `/unit/assetTask/emailzc`, + method: "post", + data, + }) + } + //电子邮件tijiao + export function assetTaskemailjyTj(data) { + return request({ + url: `/unit/assetTask/emailjyTj`, + method: "post", + data, + }) +} + //移动应用审核报废 + export function assetTaskappzc(data) { + return request({ + url: `/unit/assetTask/appzc`, + method: "post", + data, + }) + } + //移动应用审核报废 + export function assetTaskappjyTj(data) { + return request({ + url: `/unit/assetTask/appjyTj`, + method: "post", + data, + }) + } + //小程序单位端校验提交 +export function assetTaskxcxjyTj(data) { + return request({ + url: `/unit/assetTask/xcxjyTj`, + method: "post", + data, + }) + } + + //小程序单位端校验提交 +export function assetTaskgzhjyTj(data) { + return request({ + url: `/unit/assetTask/gzhjyTj`, + method: "post", + data, + }) +} \ No newline at end of file diff --git a/src/views/auditPages/taskManagement/audit.vue b/src/views/auditPages/taskManagement/audit.vue index 0265a48..5ef953a 100644 --- a/src/views/auditPages/taskManagement/audit.vue +++ b/src/views/auditPages/taskManagement/audit.vue @@ -1,15 +1,31 @@ + diff --git a/src/views/components/renwuType/butongguo.vue b/src/views/components/renwuType/butongguo.vue new file mode 100644 index 0000000..4186e1a --- /dev/null +++ b/src/views/components/renwuType/butongguo.vue @@ -0,0 +1,92 @@ + + + + + diff --git a/src/views/components/renwuType/index_v1.vue b/src/views/components/renwuType/index_v1.vue new file mode 100644 index 0000000..d3d1463 --- /dev/null +++ b/src/views/components/renwuType/index_v1.vue @@ -0,0 +1,508 @@ + + + \ No newline at end of file diff --git a/src/views/components/renwuType/index_v2.vue b/src/views/components/renwuType/index_v2.vue new file mode 100644 index 0000000..6b01b97 --- /dev/null +++ b/src/views/components/renwuType/index_v2.vue @@ -0,0 +1,483 @@ + + + \ No newline at end of file diff --git a/src/views/components/renwuType/index_v3.vue b/src/views/components/renwuType/index_v3.vue new file mode 100644 index 0000000..0470e6f --- /dev/null +++ b/src/views/components/renwuType/index_v3.vue @@ -0,0 +1,426 @@ + + + \ No newline at end of file diff --git a/src/views/components/renwuType/index_v4.vue b/src/views/components/renwuType/index_v4.vue new file mode 100644 index 0000000..61cf73f --- /dev/null +++ b/src/views/components/renwuType/index_v4.vue @@ -0,0 +1,387 @@ + + + \ No newline at end of file diff --git a/src/views/auditPages/components/webType1.vue b/src/views/components/renwuType/webType1.vue similarity index 99% rename from src/views/auditPages/components/webType1.vue rename to src/views/components/renwuType/webType1.vue index 078b6ac..24e345f 100644 --- a/src/views/auditPages/components/webType1.vue +++ b/src/views/components/renwuType/webType1.vue @@ -3181,7 +3181,8 @@ export default { assetId: this.$route.query.assetId, xtmc:this.ruleForm.xtmc, btgyy:this.dialogruleForm.btgyy, - status: 4 + status: 4, + type:this.$route.query.type } assetTasksh(tijioaobj).then(res=>{ if(res.code == 200){ @@ -3213,7 +3214,8 @@ export default { taskId: this.$route.query.taskId, assetId: this.$route.query.assetId, xtmc:this.ruleForm.xtmc, - status: 3 + status: 3, + type:this.$route.query.type } tijioaobj.status = 3 assetTasksh(tijioaobj).then(res=>{ diff --git a/src/views/components/renwuType/webType2DW.vue b/src/views/components/renwuType/webType2DW.vue new file mode 100644 index 0000000..8bfbe23 --- /dev/null +++ b/src/views/components/renwuType/webType2DW.vue @@ -0,0 +1,3298 @@ + + diff --git a/src/views/system/user/danweiList.vue b/src/views/system/user/danweiList.vue index 932b111..136ffd3 100644 --- a/src/views/system/user/danweiList.vue +++ b/src/views/system/user/danweiList.vue @@ -235,8 +235,14 @@ export default { } return ''; }, + getType(type){ + this.queryParams.type = type.join(",") + }, /** 查询用户列表 */ - getList() { + getList(type) { + if(this.queryParams.type){ + this.queryParams.type = this.queryParams.type + } this.loading = true; this.queryParams.isSearch = 1 listUnitdw(this.queryParams).then(response => { @@ -261,6 +267,9 @@ export default { }, /** 重置按钮操作 */ resetQuery() { + if(this.queryParams.type){ + this.queryParams.type = this.queryParams.type + } this.resetForm("queryForm"); this.toggleSelection() this.handleQuery(); diff --git a/src/views/unitPages/myTask/audit copy.vue b/src/views/unitPages/myTask/audit copy.vue new file mode 100644 index 0000000..110049f --- /dev/null +++ b/src/views/unitPages/myTask/audit copy.vue @@ -0,0 +1,3298 @@ + + diff --git a/src/views/unitPages/myTask/audit.vue b/src/views/unitPages/myTask/audit.vue index 110049f..7cd3a52 100644 --- a/src/views/unitPages/myTask/audit.vue +++ b/src/views/unitPages/myTask/audit.vue @@ -1,3298 +1,43 @@ - - + + + + + \ No newline at end of file diff --git a/src/views/unitPages/myTask/index.vue b/src/views/unitPages/myTask/index.vue index a376e8b..ecfd6c9 100644 --- a/src/views/unitPages/myTask/index.vue +++ b/src/views/unitPages/myTask/index.vue @@ -300,7 +300,7 @@ export default { }, // 关闭弹框 importClose() { - + this.resetForm() }, // 查看详情 goInfo(row) { diff --git a/src/views/unitPages/myTask/info.vue b/src/views/unitPages/myTask/info.vue index e064bbb..08da3c7 100644 --- a/src/views/unitPages/myTask/info.vue +++ b/src/views/unitPages/myTask/info.vue @@ -22,7 +22,9 @@ 任务期限:{{ titleInfoObj.taskDeadline }} - + + 核查资产类型:{{ listTow.join(",") }} + @@ -39,7 +41,7 @@ - + @@ -96,16 +98,21 @@
+ + + + - - + + @@ -130,22 +137,24 @@ @@ -159,30 +168,30 @@
任务流程节点
-
+
- +
- - {{item.assetName}}: + + {{ item.assetName }}: {{ item.xfTime }}
- - - - {{chakanyuanyin}} - - - - + + + + {{ chakanyuanyin }} + + + +