diff --git a/.env.development b/.env.development index 846fb53..ffd27ca 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,8 @@ VUE_APP_TITLE = 太仓资产管理系统 ENV = 'development' # 若依管理系统/开发环境 -VUE_APP_BASE_API = 'http://192.168.0.108:9015' +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 diff --git a/src/views/auditPages/assetsManagement/assetsAuth.vue b/src/views/auditPages/assetsManagement/assetsAuth.vue index 134ea06..cec95bf 100644 --- a/src/views/auditPages/assetsManagement/assetsAuth.vue +++ b/src/views/auditPages/assetsManagement/assetsAuth.vue @@ -2757,7 +2757,7 @@ - 报废原因 + 关停原因 diff --git a/src/views/auditPages/assetsManagement/index.vue b/src/views/auditPages/assetsManagement/index.vue index b1aa72e..68b73c0 100644 --- a/src/views/auditPages/assetsManagement/index.vue +++ b/src/views/auditPages/assetsManagement/index.vue @@ -127,7 +127,7 @@ 维护中 - 报废 + 关停 diff --git a/src/views/auditPages/taskManagement/audit.vue b/src/views/auditPages/taskManagement/audit.vue index 4251c89..078b6ac 100644 --- a/src/views/auditPages/taskManagement/audit.vue +++ b/src/views/auditPages/taskManagement/audit.vue @@ -2711,7 +2711,7 @@   -              报废原因 +              关停原因                                       @@ -2726,6 +2726,22 @@ 通过 + + + + + + + + + 取消 + 确定 + + + + + + @@ -2734,6 +2750,7 @@ import pcas from "@/utils/pca-code.json" import myUpload from "@/views/components/myUpload/index.vue"; import { assetUnitData, assetInfo } from "@/api/auditPagesApi/index"; import { assetTasktaskSh, geassetTaskcHc, assetTasksh } from "@/api/renwuApi/index.js" +import myDialog from "@/views/components/myDialog/index.vue" export default { name: "AssetsAuth", @@ -2745,10 +2762,19 @@ export default { 'xtfhqk_fcg','xtfhqk_fxl','xtfhqk_fzd','xtfhqk_fls' ], components:{ - myUpload + myUpload, + myDialog }, data() { return { + dialogruleForm:{ + btgyy:"" + }, + dialogruleFormrules:{ + btgyy: [ + { required: true, message: '请输入', trigger: 'blur' }, + ], + }, shaojunbuyao:false, accept:['xls','xlsx','doc','docx','pdf','rar','zip','pcap','txt'], acceptTwo:['jpg','jpeg','png'], @@ -2924,6 +2950,7 @@ export default { } }, mounted(){ + let obj = { taskId: this.$route.query.taskId, assetId: this.$route.query.assetId @@ -2951,6 +2978,15 @@ export default { } }, methods:{ + importClose(){}, + // 关闭新增弹窗 + resetForm() { + this.dialogruleForm = { + btgyy:"" + } + this.$refs.liebiaoDialog.close() + + }, // 获取详情 getInfo(obj){ this.loading = true; @@ -3137,24 +3173,56 @@ export default { this.ruleForm.dbxxCpdf = ""; } }, - // 新增资产确认按钮 - newAssets(type) { - this.loading = true; - - let tijioaobj = { + submitForm(formName) { + this.$refs[formName].validate((valid) => { + if (valid) { + let tijioaobj = { taskId: this.$route.query.taskId, assetId: this.$route.query.assetId, xtmc:this.ruleForm.xtmc, + btgyy:this.dialogruleForm.btgyy, status: 4 } + assetTasksh(tijioaobj).then(res=>{ + if(res.code == 200){ + this.$modal.msgSuccess("审核成功"); + this.loading = false + this.$router.go(-1); + } + }) + + } else { + console.log('error submit!!'); + return false; + } + }); + + }, + // 新增资产确认按钮 + newAssets(type) { + + + //不通过 if (type == 0) { - tijioaobj.status = 4 + this.$refs.liebiaoDialog.open() } if (type == 1) { - + this.loading = true; + let tijioaobj = { + taskId: this.$route.query.taskId, + assetId: this.$route.query.assetId, + xtmc:this.ruleForm.xtmc, + status: 3 + } tijioaobj.status = 3 - + assetTasksh(tijioaobj).then(res=>{ + if(res.code == 200){ + this.$modal.msgSuccess("审核成功"); + this.loading = false + this.$router.go(-1); + } + }) // this.ruleForm.xttz = this.xttz.join(','); // this.ruleForm.xtfhqkFcg = this.xtfhqkFcg.join(','); @@ -3185,13 +3253,7 @@ export default { // }) // } } - assetTasksh(tijioaobj).then(res=>{ - if(res.code == 200){ - this.$modal.msgSuccess("审核成功"); - this.loading = false - this.$router.go(-1); - } - }) + }, }, beforeRouteEnter(to,from,next){ diff --git a/src/views/auditPages/taskManagement/auditList.vue b/src/views/auditPages/taskManagement/auditList.vue index 35c44f6..0535e46 100644 --- a/src/views/auditPages/taskManagement/auditList.vue +++ b/src/views/auditPages/taskManagement/auditList.vue @@ -97,13 +97,13 @@ diff --git a/src/views/auditPages/taskManagement/index.vue b/src/views/auditPages/taskManagement/index.vue index 2ae5d8d..30a1b0b 100644 --- a/src/views/auditPages/taskManagement/index.vue +++ b/src/views/auditPages/taskManagement/index.vue @@ -79,19 +79,19 @@ diff --git a/src/views/auditPages/taskManagement/info.vue b/src/views/auditPages/taskManagement/info.vue index 9728b6d..a8fe459 100644 --- a/src/views/auditPages/taskManagement/info.vue +++ b/src/views/auditPages/taskManagement/info.vue @@ -59,7 +59,7 @@ - @@ -113,27 +113,27 @@ @@ -189,16 +194,26 @@ + + + + + {{chakanyuanyin}} + + +