diff --git a/src/assets/style/common.scss b/src/assets/style/common.scss
index 075a0e8..0c13132 100644
--- a/src/assets/style/common.scss
+++ b/src/assets/style/common.scss
@@ -80,6 +80,9 @@ a {
&.w-120 {
width: 120px;
}
+ &.w-150 {
+ width: 150px;
+ }
&.w-180 {
width: 180px;
}
diff --git a/src/components/CompanyForm/index.vue b/src/components/CompanyForm/index.vue
index dba2df1..d5ffe87 100644
--- a/src/components/CompanyForm/index.vue
+++ b/src/components/CompanyForm/index.vue
@@ -2,7 +2,7 @@
-
+
+
+
diff --git a/src/views/DisposalSuggestions/HandleForm.vue b/src/views/DisposalSuggestions/HandleForm.vue
index d8b7246..fdeea3c 100644
--- a/src/views/DisposalSuggestions/HandleForm.vue
+++ b/src/views/DisposalSuggestions/HandleForm.vue
@@ -62,12 +62,21 @@
{{ dataForm.questionClass || "--" }}
+
+
+
+
diff --git a/src/views/DisposalSuggestions/index.vue b/src/views/DisposalSuggestions/index.vue
index 6b4ca09..4c6eab5 100644
--- a/src/views/DisposalSuggestions/index.vue
+++ b/src/views/DisposalSuggestions/index.vue
@@ -6,29 +6,42 @@
-
+
+
+
+
+
+
+
-
+
-
-
+
-
+
查询
重置
@@ -97,6 +110,7 @@
department:undefined,
questionType:undefined,
questionClass:undefined,
+ creatorTime: [],
},
list: [],
listLoading: true,
diff --git a/src/views/baseCaseHandling/Form.vue b/src/views/baseCaseHandling/Form.vue
index 9f468f0..7139f2b 100644
--- a/src/views/baseCaseHandling/Form.vue
+++ b/src/views/baseCaseHandling/Form.vue
@@ -1,6 +1,6 @@
+
-
+
{{ dataForm.systemNameStr || '--' }}
- 运营主体:
+ 运营主体/个人:
{{ dataForm.registeredEntityStr || '--' }}
diff --git a/src/views/baseComapnyInfo/Form.vue b/src/views/baseComapnyInfo/Form.vue
index 0f4dc4f..c00c704 100644
--- a/src/views/baseComapnyInfo/Form.vue
+++ b/src/views/baseComapnyInfo/Form.vue
@@ -1,5 +1,5 @@
-
-
-
+
diff --git a/src/views/baseComapnyInfo/index.vue b/src/views/baseComapnyInfo/index.vue
index fbf0f3c..fca40d0 100644
--- a/src/views/baseComapnyInfo/index.vue
+++ b/src/views/baseComapnyInfo/index.vue
@@ -1,13 +1,13 @@
-
公司信息
+
运营主体信息
-
+
@@ -126,7 +126,11 @@ export default {
],
};
},
- computed: {},
+ computed: {
+ laderType() {
+ return this.$store.state.user.laderType;
+ }
+ },
created() {
this.initAreaTypeList();
this.initData();
diff --git a/src/views/baseInspectionReport/Form.vue b/src/views/baseInspectionReport/Form.vue
index 6a87d78..019bc44 100644
--- a/src/views/baseInspectionReport/Form.vue
+++ b/src/views/baseInspectionReport/Form.vue
@@ -1,6 +1,6 @@
-
+
+
+
+
+
+
+
-
+
-
+
-
+
查询
重置
@@ -103,6 +116,7 @@
department:undefined,
questionType:undefined,
questionClass:undefined,
+ creatorTime: [],
},
list: [],
listLoading: true,
diff --git a/src/views/basePrincipalResponsibility/Form.vue b/src/views/basePrincipalResponsibility/Form.vue
index e2b8355..10eedb6 100644
--- a/src/views/basePrincipalResponsibility/Form.vue
+++ b/src/views/basePrincipalResponsibility/Form.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/src/views/baseSpecialAction/Form.vue b/src/views/baseSpecialAction/Form.vue
index fd5e145..53b4004 100644
--- a/src/views/baseSpecialAction/Form.vue
+++ b/src/views/baseSpecialAction/Form.vue
@@ -1,6 +1,6 @@
-
@@ -43,112 +43,112 @@
>
@@ -158,57 +158,57 @@
@@ -188,6 +203,8 @@ export default {
HandFormVisible: false,
DisposalHandleFormVisible: false,
DisposalFormVisible: false,
+ dialogVisible: false,
+ dataForm: {},
};
},
created() {
@@ -309,30 +326,36 @@ export default {
},
async handleTask(row) {
if(row.taskType == '专项行动') {
- let loadingInstance = Loading.service({
- lock: true,
- text: 'Loading',
- spinner: 'el-icon-loading',
- background: 'rgba(255, 255, 255, 0.7)'
- });
- this.formVisible = true;
- // let data = await this.getBaseSpecialActionInfo('588008032122701061');
- let data = await this.getBaseSpecialActionInfo(row.taskCorrelationId);
- var Itemid = data.itemId || '';//数据id,没有的话就是新增 ,有的话就是修改
- var modelId = data.formId;//关联的表单id
- var taskId = data.id; // 当前专项行动id
- var isPreview = false;//固定死,值不变
- var useFormPermission = false;//固定死,值不变
- var formData = [];
- request({
- url: '/visualdev/OnlineDev/'+modelId+'/Config',
- method: "GET",
- params:null
- }).then(res => {
- formData = res.data.formData;
- this.$refs.NCCForm.init(formData, modelId, Itemid, isPreview, useFormPermission, taskId);
- loadingInstance.close();
- });
+ this.dialogVisible = true;
+ this.dataForm = {
+ content: row.taskContent,
+ title: row.taskTitle,
+ row: row,
+ };
+ // let loadingInstance = Loading.service({
+ // lock: true,
+ // text: 'Loading',
+ // spinner: 'el-icon-loading',
+ // background: 'rgba(255, 255, 255, 0.7)'
+ // });
+ // this.formVisible = true;
+ // // let data = await this.getBaseSpecialActionInfo('588008032122701061');
+ // let data = await this.getBaseSpecialActionInfo(row.taskCorrelationId);
+ // var Itemid = data.itemId || '';//数据id,没有的话就是新增 ,有的话就是修改
+ // var modelId = data.formId;//关联的表单id
+ // var taskId = data.id; // 当前专项行动id
+ // var isPreview = false;//固定死,值不变
+ // var useFormPermission = false;//固定死,值不变
+ // var formData = [];
+ // request({
+ // url: '/visualdev/OnlineDev/'+modelId+'/Config',
+ // method: "GET",
+ // params:null
+ // }).then(res => {
+ // formData = res.data.formData;
+ // this.$refs.NCCForm.init(formData, modelId, Itemid, isPreview, useFormPermission, taskId);
+ // loadingInstance.close();
+ // });
} else {
let type = row.taskType;
if(row.taskType == '核查处理' || row.taskType == '研判') {
@@ -346,6 +369,37 @@ export default {
})
}
},
+ closeDis() {
+ this.dialogVisible = false;
+ this.dataForm = {};
+ this.$forceUpdate();
+ },
+ async handleEditForm(row) {
+ let loadingInstance = Loading.service({
+ lock: true,
+ text: 'Loading',
+ spinner: 'el-icon-loading',
+ background: 'rgba(255, 255, 255, 0.7)'
+ });
+ this.formVisible = true;
+ // let data = await this.getBaseSpecialActionInfo('588008032122701061');
+ let data = await this.getBaseSpecialActionInfo(row.taskCorrelationId);
+ var Itemid = data.itemId || '';//数据id,没有的话就是新增 ,有的话就是修改
+ var modelId = data.formId;//关联的表单id
+ var taskId = data.id; // 当前专项行动id
+ var isPreview = false;//固定死,值不变
+ var useFormPermission = false;//固定死,值不变
+ var formData = [];
+ request({
+ url: '/visualdev/OnlineDev/'+modelId+'/Config',
+ method: "GET",
+ params:null
+ }).then(res => {
+ formData = res.data.formData;
+ this.$refs.NCCForm.init(formData, modelId, Itemid, isPreview, useFormPermission, taskId);
+ loadingInstance.close();
+ });
+ },
getDialog(type) {
switch (type) {
case '归属地变更':
@@ -377,6 +431,7 @@ export default {
},
taskRefresh(key, val) {
this[key] = false;
+ key == 'formVisible' && (this.dialogVisible = false);
val && this.getAllTaskList();
}
},
@@ -500,4 +555,24 @@ export default {
}
}
}
+.baseSpecialAction {
+ h4 {
+ text-align: center;
+ line-height: 40px;
+ border-bottom: 1px solid #ccc;
+ }
+ .content {
+ padding: 20px;
+ border-bottom: 1px solid #ccc;
+ }
+ .tag-group {
+ margin: 10px 0;
+ }
+ .title-tag {
+ margin: 5px 8px;
+ }
+ :deep(.el-tag) {
+ margin: 4px 4px;
+ }
+}