diff --git a/src/views/allot/list.vue b/src/views/allot/list.vue
index 8168f8b..d8a59bd 100644
--- a/src/views/allot/list.vue
+++ b/src/views/allot/list.vue
@@ -869,7 +869,8 @@ export default {
renwuList: this.selection,
renlingren: this.renlingren,
renwudan: this.renwudan,
- bjdIds: this.bjdIds
+ bjdIds: this.bjdIds,
+ departmentId: this.departmentId
},
paramsSerializer: function(data) {
return require('qs').stringify(data, { indices: false })
diff --git a/src/views/bjd/dj_input.vue b/src/views/bjd/dj_input.vue
index 3f98977..6a2ef42 100644
--- a/src/views/bjd/dj_input.vue
+++ b/src/views/bjd/dj_input.vue
@@ -333,12 +333,12 @@
-
+
-
+
@@ -1687,6 +1687,10 @@ export default {
this.bjd.baojiandianhua = this.bjd.weibaodanweiDianhua
}
this.loadQuhua()
+ if (this.formState === 'finish') {
+ this.bjd.shouliren = this.formatter.getChineseName(null, null, this.bjd.shouliren)
+ this.bjd.updateBy = this.formatter.getChineseName(null, null, this.bjd.updateBy)
+ }
})
},
loadQuhua() {
diff --git a/src/views/bjd/jj_input.vue b/src/views/bjd/jj_input.vue
index 3d09cb5..661c706 100644
--- a/src/views/bjd/jj_input.vue
+++ b/src/views/bjd/jj_input.vue
@@ -841,6 +841,10 @@ export default {
this.getSblb()
// 查询报检参数信息
this.getParamById()
+ if (this.formState === 'finish') {
+ this.bjd.shouliren = this.formatter.getChineseName(null, null, this.bjd.shouliren)
+ this.bjd.updateBy = this.formatter.getChineseName(null, null, this.bjd.updateBy)
+ }
})
},
getParamById() {
diff --git a/src/views/ysjl/3000/common/index.vue b/src/views/ysjl/3000/common/index.vue
index a47e749..7781d83 100644
--- a/src/views/ysjl/3000/common/index.vue
+++ b/src/views/ysjl/3000/common/index.vue
@@ -182,10 +182,10 @@
@@ -206,10 +206,10 @@
@@ -387,25 +387,25 @@
v-if="
fromType === 2 ||
fromType === 6 ||
- fromType == 10 ||
- fromType == 12
+ fromType === 10 ||
+ fromType === 12
"
:gutter="20"
>
-
+
-
+
@@ -694,8 +694,13 @@
-
-
+
+