From 05cbdd3e06f29e0637ff489dcd05751da8f8eede Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Sun, 29 Aug 2021 22:07:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/allot/list.vue             |  3 ++-
 src/views/bjd/dj_input.vue           |  8 +++++--
 src/views/bjd/jj_input.vue           |  4 ++++
 src/views/ysjl/3000/common/index.vue | 31 ++++++++++++++++------------
 4 files changed, 30 insertions(+), 16 deletions(-)

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 @@
               <el-row :gutter="20">
                 <el-col :span="9">
                   <el-form-item label="受理人:" prop="shouliren">
-                    <el-input :model="formatter.getChineseName(null, null, bjd.shouliren)" type="text" disabled />
+                    <el-input v-model="bjd.shouliren" type="text" disabled />
                   </el-form-item>
                 </el-col>
                 <el-col :span="9">
                   <el-form-item label="最后修改人:" prop="updateBy">
-                    <el-input :model="formatter.getChineseName(null, null, bjd.updateBy)" type="text" disabled />
+                    <el-input v-model="bjd.updateBy" type="text" disabled />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -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 @@
               <el-col :span="18">
                 <el-form-item
                   label="施工单位名称"
-                  prop="shigongdanweimingcheng"
+                  prop="shigongdanwei"
                 >
                   <el-input
-                    v-model="ysjl.shigongdanweimingcheng"
+                    v-model="ysjl.shigongdanwei"
                     type="text"
                     :disabled="edit"
                   />
@@ -206,10 +206,10 @@
               <el-col :span="9">
                 <el-form-item
                   label="施工单位许可证编号"
-                  prop="shigongdanweixukezhengbianhao"
+                  prop="shigongxukezheng"
                 >
                   <el-input
-                    v-model="ysjl.shigongdanweixukezhengbianhao"
+                    v-model="ysjl.shigongxukezheng"
                     type="text"
                     :disabled="edit"
                   />
@@ -387,25 +387,25 @@
               v-if="
                 fromType === 2 ||
                   fromType === 6 ||
-                  fromType == 10 ||
-                  fromType == 12
+                  fromType === 10 ||
+                  fromType === 12
               "
               :gutter="20"
             >
               <el-col :span="9">
-                <el-form-item label="联系人" prop="lianxiren">
+                <el-form-item label="联系人" prop="shiyongdanweiLianxiren">
                   <el-input
-                    v-model="param.lianxiren"
+                    v-model="ysjl.shiyongdanweiLianxiren"
                     type="text"
                     :disabled="edit"
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="9">
-                <el-form-item label="联系电话" prop="dianhua">
+                <el-form-item label="联系电话" prop="shiyongdanweiDianhua">
                   <el-input
-                    v-model="param.dianhua"
-                    type="number"
+                    v-model="ysjl.shiyongdanweiDianhua"
+                    type="text"
                     :disabled="edit"
                   />
                 </el-form-item>
@@ -694,8 +694,13 @@
             </el-row>
             <el-row :gutter="20">
               <el-col :span="9">
-                <el-form-item label="检验日期" prop="jianyanjieshuriqi">
-                  <el-input v-model="ysjl.jianyanjieshuriqi" />
+                <el-form-item label="检验日期" prop="jianyankaishiriqi">
+                  <el-date-picker
+                    v-model="ysjl.jianyankaishiriqi"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择日期"
+                    style="width: 100%"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="9">