From a838655fb2398bf95f8eef198e1b7879905eb3cc Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Thu, 19 Aug 2021 18:09:24 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                        |  2 +-
 .env.test                              |  2 +-
 src/directive/permission/permission.js |  3 +--
 src/views/user/role.vue                | 29 ++++++++++++++------------
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/.env.production b/.env.production
index 1953fee..99b00d4 100644
--- a/.env.production
+++ b/.env.production
@@ -22,4 +22,4 @@ VUE_APP_SJ_API = 'http://${VUE_APP_SJ_BASE_IP_ADDRESS}:9092/SJSE/'
 VUE_APP_PREVIEW_API = '${VUE_APP_SERVER_API}/sdma-preview/'
 
 # websocket连接地址
-VUE_APP_WEBSOCKET = 'ws://${VUE_APP_SERVER_ADDRESS}/sdma-websocket/websocket/'
+VUE_APP_WEBSOCKET = 'ws://${VUE_APP_SERVER_ADDRESS}:9100/sdma-websocket/websocket/'
diff --git a/.env.test b/.env.test
index 135c37a..abe1fde 100644
--- a/.env.test
+++ b/.env.test
@@ -22,4 +22,4 @@ VUE_APP_SJ_API = 'http://${VUE_APP_SJ_BASE_IP_ADDRESS}:9092/SJSE/'
 VUE_APP_PREVIEW_API = '${VUE_APP_SERVER_API}/sdma-preview/'
 
 # websocket连接地址
-VUE_APP_WEBSOCKET = 'ws://${VUE_APP_SERVER_ADDRESS}/sdma-websocket/websocket/'
+VUE_APP_WEBSOCKET = 'ws://${VUE_APP_SERVER_ADDRESS}:9100/sdma-websocket/websocket/'
diff --git a/src/directive/permission/permission.js b/src/directive/permission/permission.js
index 5fb6b18..ce696f7 100644
--- a/src/directive/permission/permission.js
+++ b/src/directive/permission/permission.js
@@ -4,7 +4,6 @@ export default {
   inserted(el, binding, vnode) {
     const { value } = binding
     const roles = store.getters && store.getters.permissions
-    console.log(roles)
     if (value && value instanceof Array && value.length > 0) {
       const permissionRoles = value
       const hasPermission = roles.some(role => {
@@ -17,4 +16,4 @@ export default {
       throw new Error(`need roles! Like v-permission="['admin','editor']"`)
     }
   }
-}
+}
diff --git a/src/views/user/role.vue b/src/views/user/role.vue
index ca604e3..79e4226 100644
--- a/src/views/user/role.vue
+++ b/src/views/user/role.vue
@@ -52,7 +52,7 @@
             <el-table-column label="功能选项">
               <template v-if="scope.row.children.length === 0" slot-scope="scope">
                 <el-checkbox
-                  v-for="options in scope.row.resourcePermissionList"
+                  v-for="options in scope.row.resourcePermissions"
                   :key="options.id"
                   v-model="options.checked"
                   :label="options.permissionType"
@@ -154,6 +154,7 @@ export default {
     },
     getRoleMenuList(roleId) {
       getPermissionsByRoleId(roleId).then(data => {
+        data = data.map(row => row.resourcePermissionId)
         this.menuList.forEach(permission => {
           if (permission.children.length > 0) {
             this.echoChildren(permission.children, data)
@@ -167,14 +168,14 @@ export default {
       // 有下级去处理下级
       if (val.children.length > 0) {
         if (checked) {
-          this.checkedIds.add(val.resourcePermissionList[0].id)
+          this.checkedIds.add(val.resourcePermissions[0].id)
         } else {
-          this.checkedIds.delete(val.resourcePermissionList[0].id)
+          this.checkedIds.delete(val.resourcePermissions[0].id)
         }
         this.findChildren(val.children, checked)
       } else {
         // 无下级处理本级
-        val.resourcePermissionList.forEach(options => {
+        val.resourcePermissions.forEach(options => {
           options.checked = checked
           if (checked) {
             this.checkedIds.add(options.id)
@@ -190,9 +191,9 @@ export default {
       val.indeterminate = false
     },
     handleCheckChange(val) {
-      const length = val.resourcePermissionList.length
+      const length = val.resourcePermissions.length
       let checkedLength = 0
-      val.resourcePermissionList.forEach(options => {
+      val.resourcePermissions.forEach(options => {
         if (options.checked) {
           this.checkedIds.add(options.id)
           checkedLength++
@@ -211,7 +212,7 @@ export default {
       list.forEach(children => {
         children.checked = checked
         children.indeterminate = false
-        children.resourcePermissionList.forEach(options => {
+        children.resourcePermissions.forEach(options => {
           options.checked = checked
           if (checked) {
             this.checkedIds.add(options.id)
@@ -240,10 +241,12 @@ export default {
           })
           result.checked = parentCheckedLength === result.children.length
           result.indeterminate = (parentIndeterminateLength > 0 || parentCheckedLength > 0) && parentCheckedLength < result.children.length
-          if (result.checked || result.indeterminate) {
-            this.checkedIds.add(result.resourcePermissionList[0].id)
-          } else {
-            this.checkedIds.delete(result.resourcePermissionList[0].id)
+          if (result.permission.component !== 'Layout') {
+            if (result.checked || result.indeterminate) {
+              this.checkedIds.add(result.resourcePermissions[0].id)
+            } else {
+              this.checkedIds.delete(result.resourcePermissions[0].id)
+            }
           }
           // 如果还有上级，继续操作
           if (result.permission.pid !== 0) {
@@ -265,7 +268,7 @@ export default {
     },
     settingChecked(result, optionsIds) {
       let matching = false
-      result.resourcePermissionList.forEach(options => {
+      result.resourcePermissions.forEach(options => {
         optionsIds.forEach(optionsId => {
           if (options.id === optionsId) {
             options.checked = true
@@ -282,7 +285,7 @@ export default {
       menuList.forEach(permission => {
         permission.checked = false
         permission.indeterminate = false
-        permission.resourcePermissionList.forEach(options => {
+        permission.resourcePermissions.forEach(options => {
           options.checked = false
         })
         if (permission.children.length > 0) {

From adeba4f5495a20a28e74035b31c6001cc714e43f Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Thu, 19 Aug 2021 22:54:24 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Crud/crud.js |   2 +-
 src/main.js                 |   8 ++-
 src/styles/index.scss       |  40 ++++++++++++-
 src/views/user/role.vue     | 116 ++++++++++++++++++++++++++----------
 4 files changed, 133 insertions(+), 33 deletions(-)

diff --git a/src/components/Crud/crud.js b/src/components/Crud/crud.js
index 4b8d2eb..0434f07 100644
--- a/src/components/Crud/crud.js
+++ b/src/components/Crud/crud.js
@@ -291,7 +291,7 @@ function CRUD(options) {
       if (!delAll) {
         dataStatus.delete = CRUD.STATUS.PROCESSING
       }
-      return crud.crudMethod.del(delAll ? { idArray: ids } : singleId).then(() => {
+      return crud.crudMethod.del(delAll ? { ids: ids } : singleId).then(() => {
         if (!delAll) {
           dataStatus.delete = CRUD.STATUS.PREPARED
         }
diff --git a/src/main.js b/src/main.js
index 8a1775c..f408818 100644
--- a/src/main.js
+++ b/src/main.js
@@ -31,6 +31,9 @@ import adaptive from './directive/el-table'
 import vueqr from 'vue-qr'
 import JSONView from 'vue-json-viewer'
 import { checkPermission } from './utils/permission'
+
+import Cookies from 'js-cookie'
+
 Vue.use(JSONView)
 Vue.use(permission)
 
@@ -49,7 +52,10 @@ Vue.use(CellGroup)
 Vue.use(Cell)
 Vue.use(Col)
 
-Vue.use(ElementUI, { locale })
+Vue.use(ElementUI, {
+  locale,
+  size: Cookies.get('size') || 'small' // set element-ui default size
+})
 
 // 全局的常量
 Vue.prototype.checkPermission = checkPermission
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 748f8c8..70734c3 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -87,7 +87,45 @@ a:hover {
 }
 
 .app-container {
-  padding: 5px 20px;
+  padding: 20px 20px 5px 20px;
+}
+
+
+.components-container {
+  margin: 30px 50px;
+  position: relative;
+}
+
+.filter-container {
+  padding-bottom: 10px;
+
+  .filter-item {
+    display: inline-block;
+    vertical-align: middle;
+    margin-bottom: 10px;
+  }
+}
+
+.head-container {
+  padding-bottom: 10px;
+  .filter-item {
+    display: inline-block;
+    vertical-align: middle;
+    margin: 0 3px 10px 0;
+  }
+  .el-button+.el-button {
+    margin-left: 0 !important;
+  }
+  .el-select__caret.el-input__icon.el-icon-arrow-up{
+    line-height: 30.5px;
+  }
+  .date-item {
+    display: inline-block;
+    vertical-align: middle;
+    margin-bottom: 10px;
+    height: 30.5px;
+    width: 223px !important;
+  }
 }
 
 fieldset {
diff --git a/src/views/user/role.vue b/src/views/user/role.vue
index 79e4226..4eff965 100644
--- a/src/views/user/role.vue
+++ b/src/views/user/role.vue
@@ -18,8 +18,10 @@
     </CustomTable>
     <pagination />
     <!--弹出框内容-->
-    <el-dialog
-      width="80%"
+    <el-drawer
+      ref="roleDrawer"
+      direction="rtl"
+      size="90%"
       :before-close="crud.cancelCU"
       :visible="crud.status.editor > 0"
       :title="crud.status.title"
@@ -33,14 +35,15 @@
         </el-form-item>
         <el-form-item label="功能权限：">
           <el-table
-            ref="menuList"
-            :data="menuList"
+            ref="permissions"
+            :data="permissions"
             border
             fit
+            height="680"
             highlight-current-row
             row-key="permission.id"
-            :default-expand-all="true"
             :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+            style="width: 99%;"
           >
             <el-table-column label="菜单名称" width="400">
               <template slot-scope="scope">
@@ -63,15 +66,27 @@
           </el-table>
         </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="crud.cancelCU">
-          取 消
-        </el-button>
-        <el-button type="primary" @click="crud.submitCU">
-          确 认
-        </el-button>
-      </div>
-    </el-dialog>
+      <el-row :gutter="20">
+        <el-col :span="4" :offset="2">
+          <el-select v-model="showMode" @change="changeShowMode">
+            <el-option
+              v-for="(item, index) in showModes"
+              :key="index"
+              :label="item"
+              :value="index"
+            />
+          </el-select>
+        </el-col>
+        <el-col :span="4" :offset="14">
+          <el-button type="primary" @click="crud.submitCU">
+            确 认
+          </el-button>
+          <el-button @click="crud.cancelCU">
+            取 消
+          </el-button>
+        </el-col>
+      </el-row>
+    </el-drawer>
   </div>
 </template>
 
@@ -98,7 +113,7 @@ const defaultForm = form({
   id: null,
   roleName: '',
   roleCode: '',
-  menuOptionIds: {}
+  resourcePermissionIds: {}
 })
 
 export default {
@@ -107,7 +122,7 @@ export default {
   mixins: [defaultCrud, defaultForm, header()],
   data() {
     return {
-      menuList: [],
+      permissions: [],
       colConfigs: [
         { prop: 'roleName', label: '角色名称', align: 'center' },
         { prop: 'roleCode', label: '角色代码', align: 'center' },
@@ -126,7 +141,9 @@ export default {
           { required: true, message: '请输入角色代码', trigger: 'blur' }
         ]
       },
-      checkedIds: new Set()
+      checkedIds: new Set(),
+      showMode: 0,
+      showModes: ['合并所有', '展开所有', '全部勾选', '取消勾选']
     }
   },
   mounted() {
@@ -135,7 +152,7 @@ export default {
   methods: {
     // 新增与编辑前做的操作
     [CRUD.HOOK.afterToCU]() {
-      this.clearChecked(this.menuList)
+      this.clearChecked(this.permissions)
       this.checkedIds.clear()
     },
     // 编辑框打开后做的操作
@@ -144,18 +161,55 @@ export default {
     },
     // 提交前的验证
     [CRUD.HOOK.afterValidateCU]() {
-      this.form.menuOptionIds = Array.from(this.checkedIds)
+      this.form.resourcePermissionIds = Array.from(this.checkedIds)
+    },
+    /**
+     * 改变展示方式
+     */
+    changeShowMode(val) {
+      switch (val) {
+        case 0:
+          this.permissions.forEach(row => {
+            setTimeout(() => {
+              this.$refs.permissions.toggleRowExpansion(row, false)
+            }, 1000)
+          })
+          break
+        case 1:
+          this.permissions.forEach(row => {
+            setTimeout(() => {
+              this.$refs.permissions.toggleRowExpansion(row, true)
+            }, 1000)
+          })
+          break
+        case 2:
+          this.permissions.forEach(row => {
+            row.checked = true
+            row.indeterminate = false
+            this.handleCheckAllChange(row, true)
+          })
+          break
+        case 3:
+          this.permissions.forEach(row => {
+            row.checked = false
+            row.indeterminate = false
+            this.handleCheckAllChange(row, false)
+          })
+          break
+        default:
+          break
+      }
     },
     // 获取菜单树
     getAllMenu() {
       getTree().then(data => {
-        this.menuList = data
+        this.permissions = data
       })
     },
     getRoleMenuList(roleId) {
       getPermissionsByRoleId(roleId).then(data => {
         data = data.map(row => row.resourcePermissionId)
-        this.menuList.forEach(permission => {
+        this.permissions.forEach(permission => {
           if (permission.children.length > 0) {
             this.echoChildren(permission.children, data)
           } else {
@@ -167,10 +221,12 @@ export default {
     handleCheckAllChange(val, checked) {
       // 有下级去处理下级
       if (val.children.length > 0) {
-        if (checked) {
-          this.checkedIds.add(val.resourcePermissions[0].id)
-        } else {
-          this.checkedIds.delete(val.resourcePermissions[0].id)
+        if (val.resourcePermissions.length) {
+          if (checked) {
+            this.checkedIds.add(val.resourcePermissions[0].id)
+          } else {
+            this.checkedIds.delete(val.resourcePermissions[0].id)
+          }
         }
         this.findChildren(val.children, checked)
       } else {
@@ -186,7 +242,7 @@ export default {
       }
       // 处理上级
       if (val.permission.pid !== 0) {
-        this.findParent(this.menuList, val.permission.pid)
+        this.findParent(this.permissions, val.permission.pid)
       }
       val.indeterminate = false
     },
@@ -205,7 +261,7 @@ export default {
       val.indeterminate = checkedLength > 0 && checkedLength < length
       // 处理上级
       if (val.permission.pid !== 0) {
-        this.findParent(this.menuList, val.permission.pid)
+        this.findParent(this.permissions, val.permission.pid)
       }
     },
     findChildren(list, checked) {
@@ -250,7 +306,7 @@ export default {
           }
           // 如果还有上级，继续操作
           if (result.permission.pid !== 0) {
-            this.findParent(this.menuList, result.permission.pid)
+            this.findParent(this.permissions, result.permission.pid)
           }
         } else if (result.children.length > 0) {
           this.findParent(result.children, pid)
@@ -281,8 +337,8 @@ export default {
       }
     },
     // 递归清空菜单和选项
-    clearChecked(menuList) {
-      menuList.forEach(permission => {
+    clearChecked(permissions) {
+      permissions.forEach(permission => {
         permission.checked = false
         permission.indeterminate = false
         permission.resourcePermissions.forEach(options => {

From 9656524f34a9ae0517969ff241147bc89444a064 Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Fri, 20 Aug 2021 21:55:06 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E7=BC=96=E8=BE=91=EF=BC=9A=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E8=8C=83=E5=9B=B4=E9=99=90=E5=88=B6=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/data_scope_department.js              |   9 +
 src/components/Crud/Edit/index.vue            |  18 +-
 src/views/borrow/borrow.vue                   |  13 +-
 src/views/user/components/data-permission.vue | 247 ++++++++++++++++++
 src/views/user/role.vue                       |  17 +-
 5 files changed, 280 insertions(+), 24 deletions(-)
 create mode 100644 src/api/data_scope_department.js
 create mode 100644 src/views/user/components/data-permission.vue

diff --git a/src/api/data_scope_department.js b/src/api/data_scope_department.js
new file mode 100644
index 0000000..d7bd05c
--- /dev/null
+++ b/src/api/data_scope_department.js
@@ -0,0 +1,9 @@
+import api from '@/utils/api'
+
+export function getAll(params) {
+  return api({
+    url: '/dataScopeDepartment/all',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/components/Crud/Edit/index.vue b/src/components/Crud/Edit/index.vue
index 9c80023..a4ec5b7 100644
--- a/src/components/Crud/Edit/index.vue
+++ b/src/components/Crud/Edit/index.vue
@@ -1,8 +1,5 @@
 <template>
-  <el-button v-if="!flag" type="text" :disabled="disabledEdit" icon="edit" @click="crud.toEdit(data)">
-    修改
-  </el-button>
-  <el-button v-else type="text" :disabled="disabledEdit" icon="edit" @click="editFn(data)">
+  <el-button v-permission="permission.edit" type="text" :disabled="disabledEdit" icon="edit" @click="crud.toEdit(data)">
     修改
   </el-button>
 </template>
@@ -15,18 +12,13 @@ export default {
       type: Object,
       required: true
     },
+    permission: {
+      type: Object,
+      required: true
+    },
     disabledEdit: {
       type: Boolean,
       default: false
-    },
-    flag: {
-      type: Boolean,
-      defalut: false
-    }
-  },
-  methods: {
-    editFn() {
-      this.$emit('editFn', this.data)
     }
   }
 }
diff --git a/src/views/borrow/borrow.vue b/src/views/borrow/borrow.vue
index e61d50c..f43289b 100644
--- a/src/views/borrow/borrow.vue
+++ b/src/views/borrow/borrow.vue
@@ -52,13 +52,9 @@
     >
       <el-table-column slot="operation" align="center" width="100" label="操作">
         <template slot-scope="scope">
-          <Edit
-            :permission="permission"
-            :data="scope.row"
-            :disabled-edit="false"
-            :flag="true"
-            @editFn="editFn"
-          />
+          <el-button v-permission="permission.edit" type="text" icon="edit" @click="editFn(scope.row)">
+            修改
+          </el-button>
         </template>
       </el-table-column>
     </CustomTable>
@@ -97,7 +93,6 @@
 <script>
 import CRUD, { form, header, presenter } from '@/components/Crud/crud'
 // import Crud from '@/components/Crud'
-import Edit from '@/components/Crud/Edit'
 import CustomTable from '@/components/Crud/Table'
 import Pagination from '@/components/Crud/Pagination'
 import { addBorrowFn } from '@/api/common'
@@ -122,7 +117,7 @@ const defaultForm = form({
 
 export default {
   name: 'InstrumentList',
-  components: { Pagination, CustomTable, Edit },
+  components: { Pagination, CustomTable },
   mixins: [defaultCrud, defaultForm, header()],
   data() {
     return {
diff --git a/src/views/user/components/data-permission.vue b/src/views/user/components/data-permission.vue
new file mode 100644
index 0000000..e2ae5c3
--- /dev/null
+++ b/src/views/user/components/data-permission.vue
@@ -0,0 +1,247 @@
+<template>
+  <el-drawer title="数据权限" :visible="show" size="90%" :destroy-on-close="true" @close="close">
+    <el-form ref="permission" :model="permission" label-width="100px">
+      <el-form-item label="角色名称">
+        {{ permission.roleName }}
+      </el-form-item>
+      <el-form-item label="角色代码">
+        {{ permission.roleCode }}
+      </el-form-item>
+      <el-form-item label="权限范围">
+        <el-select v-model="permission.dataScope">
+          <el-option v-for="(item, index) in dataScopes" :key="index" :label="item" :value="index" />
+        </el-select>
+      </el-form-item>
+      <el-form-item v-if="permission.dataScope === 1" label="数据权限">
+        <el-table
+          ref="departments"
+          :data="departments"
+          border
+          fit
+          height="650"
+          highlight-current-row
+          row-key="id"
+          :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+          style="width: 99%;"
+        >
+          <el-table-column label="部门名称">
+            <template slot-scope="scope">
+              <el-checkbox v-model="scope.row.checked" :indeterminate="scope.row.indeterminate" @change="handleCheckAllChange(scope.row, $event)">
+                {{ scope.row.name }}
+              </el-checkbox>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form-item>
+    </el-form>
+    <el-row :gutter="20">
+      <el-col :span="4" :offset="2">
+        <el-select v-if="permission.dataScope === 1" v-model="showMode" @change="changeShowMode">
+          <el-option
+            v-for="(item, index) in showModes"
+            :key="index"
+            :label="item"
+            :value="index"
+          />
+        </el-select>
+      </el-col>
+      <el-col :span="4" :offset="14">
+        <el-button type="primary" @click="update">
+          确 认
+        </el-button>
+        <el-button @click="close">
+          取 消
+        </el-button>
+      </el-col>
+    </el-row>
+  </el-drawer>
+</template>
+
+<script>
+import CrudRole from '@/api/role'
+import { getAll } from '@/api/data_scope_department'
+
+export default {
+  name: 'DataPermission',
+  data() {
+    return {
+      show: false,
+      permission: {},
+      dataScopes: ['全部数据权限', '自定义数据权限', '本部门数据权限', '本部门及下级数据权限', '仅本人数据权限'],
+      departments: [],
+      showMode: 0,
+      showModes: ['合并所有', '展开所有', '全部勾选', '取消勾选'],
+      checkedIds: new Set()
+    }
+  },
+  mounted() {
+    const that = this
+    this.common.$on('openDataPermission', function(data) {
+      that.open(data)
+    })
+  },
+  created() {
+    const that = this
+    this.common.$on('openDataPermission', function(data) {
+      that.open(data)
+    })
+    this.getDepartmentList()
+  },
+  methods: {
+    open(data) {
+      this.permission = data
+      this.getAllDataScopeDepartment()
+      this.show = true
+    },
+    close() {
+      this.show = false
+    },
+    getAllDataScopeDepartment() {
+      getAll({
+        roleId: this.permission.id
+      }).then(data => {
+        data = data.map(row => row.departmentId)
+        this.departments.forEach(permission => {
+          if (permission.children.length > 0) {
+            this.echoChildren(permission.children, data)
+          } else {
+            this.settingChecked(permission, data)
+          }
+        })
+      })
+    },
+    getDepartmentList() {
+      // 查询列表
+      this.api({
+        url: '/department/tree',
+        method: 'get'
+      }).then(data => {
+        this.departments = data
+      })
+    },
+    /**
+     * 改变展示方式
+     */
+    changeShowMode(val) {
+      switch (val) {
+        case 0:
+          this.departments.forEach(row => this.$refs.departments.toggleRowExpansion(row, false))
+          break
+        case 1:
+          this.departments.forEach(row => this.$refs.departments.toggleRowExpansion(row, true))
+          break
+        case 2:
+          this.departments.forEach(row => {
+            row.checked = true
+            row.indeterminate = false
+            this.handleCheckAllChange(row, true)
+          })
+          break
+        case 3:
+          this.departments.forEach(row => {
+            row.checked = false
+            row.indeterminate = false
+            this.handleCheckAllChange(row, false)
+          })
+          break
+        default:
+          break
+      }
+    },
+    update() {
+      console.log(this.checkedIds)
+      console.log(Array.from(this.checkedIds))
+      this.permission.dataScopeDepartmentIds = Array.from(this.checkedIds)
+      console.log(this.permission)
+      CrudRole.edit(this.permission).then(() => this.$notify.success('操作成功'))
+    },
+    handleCheckAllChange(val, checked) {
+      if (checked) {
+        this.checkedIds.add(val.id)
+      } else {
+        this.checkedIds.delete(val.id)
+      }
+      // 有下级去处理下级
+      if (val.children.length > 0) {
+        this.findChildren(val.children, checked)
+      }
+      // 处理上级
+      if (val.parentId !== 0) {
+        this.findParent(this.departments, val.parentId)
+      }
+      val.indeterminate = false
+    },
+    findChildren(list, checked) {
+      list.forEach(children => {
+        children.checked = checked
+        children.indeterminate = false
+        if (children.children.length > 0) {
+          this.findChildren(children.children, checked)
+        }
+      })
+    },
+    findParent(list, parentId) {
+      list.forEach(result => {
+        let parentCheckedLength = 0
+        let parentIndeterminateLength = 0
+        // 对当前层级的上级操作
+        if (result.id === parentId) {
+          // 判断下级的状态，用来为父级的状态做判断
+          result.children.forEach(children => {
+            if (children.indeterminate) {
+              parentIndeterminateLength++
+            } else if (children.checked) {
+              parentCheckedLength++
+            }
+          })
+          result.checked = parentCheckedLength === result.children.length
+          result.indeterminate = (parentIndeterminateLength > 0 || parentCheckedLength > 0) && parentCheckedLength < result.children.length
+
+          if (result.checked) {
+            this.checkedIds.add(result.id)
+          } else {
+            this.checkedIds.delete(result.id)
+          }
+          // 如果还有上级，继续操作
+          if (result.parentId !== 0) {
+            this.findParent(this.departments, result.parentId)
+          }
+        } else if (result.children.length > 0) {
+          this.findParent(result.children, parentId)
+        }
+      })
+    },
+    echoChildren(list, optionsIds) {
+      list.forEach(result => {
+        if (result.children.length === 0) {
+          this.settingChecked(result, optionsIds)
+        } else {
+          this.echoChildren(result.children, optionsIds)
+        }
+      })
+    },
+    settingChecked(result, optionsIds) {
+      let matching = false
+      optionsIds.forEach(optionsId => {
+        if (result.id === optionsId) {
+          result.checked = true
+          matching = true
+        }
+      })
+      if (matching) {
+        this.handleCheckChange(result)
+      }
+    },
+    handleCheckChange(val) {
+      // 处理上级
+      if (val.parentId !== 0) {
+        this.findParent(this.departments, val.parentId)
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/user/role.vue b/src/views/user/role.vue
index 4eff965..012e153 100644
--- a/src/views/user/role.vue
+++ b/src/views/user/role.vue
@@ -10,9 +10,12 @@
     </div>
     <!--表格内容-->
     <CustomTable ref="customTable" :col-configs="colConfigs" :columns="columns" :crud="crud">
-      <el-table-column v-if="checkPermission(permission.edit)" slot="operation" align="center" width="100" label="操作">
+      <el-table-column v-if="checkPermission(permission.edit)" slot="operation" align="center" width="200" label="操作">
         <template slot-scope="scope">
           <Edit :permission="permission" :data="scope.row" :disabled-edit="false" />
+          <el-button type="text" icon="edit" @click="editDataPermission(scope.row)">
+            数据权限
+          </el-button>
         </template>
       </el-table-column>
     </CustomTable>
@@ -87,6 +90,7 @@
         </el-col>
       </el-row>
     </el-drawer>
+    <data-permission />
   </div>
 </template>
 
@@ -99,6 +103,8 @@ import CustomTable from '@/components/Crud/Table'
 import Pagination from '@/components/Crud/Pagination'
 import CrudRole from '@/api/role'
 import { getPermissionsByRoleId, getTree } from '@/api/permission'
+import DataPermission from './components/data-permission'
+import Utils from '@/utils/contact'
 
 // crud交由presenter持有
 const defaultCrud = presenter(CRUD({
@@ -118,7 +124,7 @@ const defaultForm = form({
 
 export default {
   name: 'RoleList',
-  components: { Pagination, Query, Crud, CustomTable, Edit },
+  components: { Pagination, Query, Crud, CustomTable, Edit, DataPermission },
   mixins: [defaultCrud, defaultForm, header()],
   data() {
     return {
@@ -163,6 +169,13 @@ export default {
     [CRUD.HOOK.afterValidateCU]() {
       this.form.resourcePermissionIds = Array.from(this.checkedIds)
     },
+    /**
+     * 加载数据权限窗口
+     */
+    editDataPermission(data) {
+      console.log('加载数据权限窗口')
+      Utils.$emit('openDataPermission', data)
+    },
     /**
      * 改变展示方式
      */

From 2ac0c1eea9bd4a77dfb58478e328de5fd4ddfb1f Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Fri, 20 Aug 2021 22:07:36 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=8C=E6=AC=A1?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5=E9=A1=B5=E9=9D=A2=E6=9B=B4=E6=96=B0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=97=B6=EF=BC=8C=E5=8E=9F=E6=9C=89=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=A2=E5=A4=B1=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/user/components/data-permission.vue | 1 +
 src/views/ysjl/2000/2100/zbg/dj/edit.vue      | 4 ++--
 src/views/ysjl/2000/2200/zbg/dj/edit.vue      | 6 +++---
 src/views/ysjl/7000/jj/edit.vue               | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/views/user/components/data-permission.vue b/src/views/user/components/data-permission.vue
index e2ae5c3..50d19ec 100644
--- a/src/views/user/components/data-permission.vue
+++ b/src/views/user/components/data-permission.vue
@@ -223,6 +223,7 @@ export default {
     settingChecked(result, optionsIds) {
       let matching = false
       optionsIds.forEach(optionsId => {
+        this.checkedIds.add(optionsId)
         if (result.id === optionsId) {
           result.checked = true
           matching = true
diff --git a/src/views/ysjl/2000/2100/zbg/dj/edit.vue b/src/views/ysjl/2000/2100/zbg/dj/edit.vue
index 8b04ac6..0d2efe9 100644
--- a/src/views/ysjl/2000/2100/zbg/dj/edit.vue
+++ b/src/views/ysjl/2000/2100/zbg/dj/edit.vue
@@ -1589,9 +1589,9 @@ export default {
               data: {
                 ysjl: this.ysjl,
                 param: this.param,
-                cyJyxm:{
+                cyJyxm: {
                   jyxm: jyxm,
-                  bgjyxm: jyxm,
+                  bgjyxm: jyxm
                 }
               }
             }).then(data => {
diff --git a/src/views/ysjl/2000/2200/zbg/dj/edit.vue b/src/views/ysjl/2000/2200/zbg/dj/edit.vue
index d8bce7c..c66308e 100644
--- a/src/views/ysjl/2000/2200/zbg/dj/edit.vue
+++ b/src/views/ysjl/2000/2200/zbg/dj/edit.vue
@@ -1185,9 +1185,9 @@ export default {
               data: {
                 ysjl: this.ysjl,
                 param: this.param,
-                cyJyxm:{
-                jyxm: jyxm,
-                bgjyxm: jyxm,
+                cyJyxm: {
+                  jyxm: jyxm,
+                  bgjyxm: jyxm
                 }
               }
             }).then(data => {
diff --git a/src/views/ysjl/7000/jj/edit.vue b/src/views/ysjl/7000/jj/edit.vue
index 5ad4623..da7d096 100644
--- a/src/views/ysjl/7000/jj/edit.vue
+++ b/src/views/ysjl/7000/jj/edit.vue
@@ -589,8 +589,8 @@ export default {
               data: {
                 ysjl: this.ysjl,
                 param: this.param,
-                cyJyxm:{
-                  jyxm: JSON.stringify(this.tableData),
+                cyJyxm: {
+                  jyxm: JSON.stringify(this.tableData)
                 }
               }
             }).then(data => {

From 2ae62e42b348ed62e9bfe8c6da4f7d642f114c39 Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Fri, 20 Aug 2021 22:13:32 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/user/department.vue | 61 ++++++++++++++++++++++++++++++++++-
 1 file changed, 60 insertions(+), 1 deletion(-)

diff --git a/src/views/user/department.vue b/src/views/user/department.vue
index 001abe7..38f4a6f 100644
--- a/src/views/user/department.vue
+++ b/src/views/user/department.vue
@@ -26,6 +26,8 @@
       highlight-current-row
       @row-click="onRowClick"
       @selection-change="handleSelectionChange"
+      @select="rowSelect"
+      @select-all="selectAll"
     >
       <el-table-column type="selection" width="40" />
       <el-table-column type="index" align="center" label="序号" width="80" />
@@ -117,8 +119,10 @@ export default {
         method: 'get',
         params: this.listQuery
       }).then(data => {
+        data.forEach(row => {
+          row.isChecked = false
+        })
         this.list = data
-        this.totalCount = data.total
       })
     },
     showCreate() {
@@ -227,6 +231,61 @@ export default {
     closeDialog() {
       this.unAllotUserList = []
       this.departmentUserList = []
+    },
+    /**
+     * 注意在获取初始数据时，所有节点（包括子节点）都增加一个isChecked 标志参数
+     *
+     * @param selection
+     * @param row
+     */
+    rowSelect(selection, row) {
+      if (row.children) { // 只对有子节点的行响应
+        if (!row.isChecked) { // 由行数据中的元素isChecked判断当前是否被选中
+          row.children.map((item) => { // 遍历所有子节点
+            this.$refs.list.toggleRowSelection(item, true) // 切换该子节点选中状态
+            /*
+            方法名                    说明                                      参数
+                                 用于多选表格，切换某一行的选中状态，         row, selected
+            toggleRowSelection   如果使用了第二个参数，则是设置这一行
+                                 选中与否（selected 为 true 则选中）
+             */
+            item.isChecked = true
+          })
+          row.isChecked = true // 当前行isChecked标志元素切换为false
+        } else {
+          row.children.map((item) => {
+            this.$refs.list.toggleRowSelection(item, false)
+            item.isChecked = false
+          })
+          row.isChecked = false
+        }
+        // console.log(this.multipleSelection, row);
+      }
+    },
+    selectAll(selection) {
+      // selection 是选中的数据集合
+      this.$refs.list.data.map((items) => { // 使用$ref获取注册的子组件信息，用data获取所有行，并用map函数遍历行
+        if (items.children) {
+          if (!items.isChecked) { // 若遍历出来的行未选中
+            this.$refs.list.toggleRowSelection(items, true) // 行变为选中状态
+            items.isChecked = true // 更新标志参数
+            items.children.map((item) => { // 遍历子节点并改变状态与标志参数
+              this.$refs.list.toggleRowSelection(item, true)
+              item.isChecked = true
+            })
+          } else { // 选中状态同理
+            this.$refs.list.toggleRowSelection(items, false)
+            items.isChecked = false
+            items.children.map((item) => {
+              this.$refs.list.toggleRowSelection(item, false)
+              item.isChecked = false
+            })
+          }
+        } else {
+          items.isChecked = !items.isChecked
+        }
+      })
+      // console.log(this.orgs)
     }
   }
 }

From 60fc9b44ee809c31c6b96d19a3d7b673fe2b8985 Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Sat, 21 Aug 2021 15:21:17 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E5=A4=8D=E5=88=B6=E7=83=9F=E5=8F=B0?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E9=99=84=E4=BB=B6=E6=A3=80=E9=AA=8C=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ysjl/2000/2100/fenxiang/aqfj.vue | 362 ++++++++++++++-------
 1 file changed, 241 insertions(+), 121 deletions(-)

diff --git a/src/views/ysjl/2000/2100/fenxiang/aqfj.vue b/src/views/ysjl/2000/2100/fenxiang/aqfj.vue
index 60c5543..5aca364 100644
--- a/src/views/ysjl/2000/2100/fenxiang/aqfj.vue
+++ b/src/views/ysjl/2000/2100/fenxiang/aqfj.vue
@@ -1,6 +1,6 @@
 <!-- 安全附件分项页面 -->
 <template>
-  <div class="app-container">
+  <div class="app-container" style="margin-top: -15px;">
     <sticky style="margin-bottom: 10px;">
       <btn ref="btn" />
     </sticky>
@@ -15,30 +15,38 @@
           </el-col>
         </el-row>
         <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="型号" prop="aqfxinghao">
+              <el-input v-model="param.aqfxinghao" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
           <el-col :span="9">
             <el-form-item label="数量" prop="aqfshuliang">
-              <el-input v-model="param.aqfshuliang" :disabled="edit || editAqf" />
+              <el-input v-model="param.aqfshuliang" :disabled="edit"><template slot="append">台</template></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="校验日期" prop="aqfjianyanriqi">
+              <el-input v-model="param.aqfjianyanriqi" :disabled="edit"/>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item label="是否在校验有效期内" label-width="170px" prop="aqfyouxiaoqi">
-              <el-select v-model="param.aqfyouxiaoqi" filterable allow-create default-first-option placeholder="请选择" :disabled="edit || editAqf">
-                <el-option label="是" value="是" />
-                <el-option label="否" value="否" />
-                <el-option label="无此项" value="无此项" />
-              </el-select>
+            <el-form-item label="校验报告编号" prop="aqfjiaoyanbaogaobianhao">
+              <el-input v-model="param.aqfjiaoyanbaogaobianhao" :disabled="edit"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="9">
-            <el-form-item prop="aqfexist">
-              <el-checkbox v-model="param.aqfexist" label="设备本体无安全阀" true-label="设备本体无安全阀" border @change="changeAqf" />
+            <el-form-item label="整定压力" prop="aqfzhengdingyali">
+              <el-input v-model="param.aqfzhengdingyali" :disabled="edit"><template slot="append">MPa</template></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item label="检验日期" label-width="135px" prop="aqfjianyanriqi">
-              <el-input v-model="param.aqfjianyanriqi" :disabled="edit || editAqf" />
+            <el-form-item label="安装位置" prop="aqfanzhuangweizhi">
+              <el-input v-model="param.aqfanzhuangweizhi" :disabled="edit"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -46,75 +54,263 @@
       <fieldset>
         <legend>爆破片装置</legend>
         <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="型号" prop="bppxinghao">
+              <el-input v-model="param.bppxinghao" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
           <el-col :span="9">
             <el-form-item label="数量" prop="bppshuliang">
-              <el-input v-model="param.bppshuliang" :disabled="edit || editBpp" />
+              <el-input v-model="param.bppshuliang" :disabled="edit"><template slot="append">个</template></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="20">
           <el-col :span="9">
-            <el-form-item label="是否按期更换" prop="bppgenghuanzhouqiyaoqiu">
-              <el-select v-model="param.bppgenghuanzhouqiyaoqiu" filterable allow-create default-first-option placeholder="请选择" :disabled="edit || editBpp">
-                <el-option label="是" value="是" />
-                <el-option label="否" value="否" />
-                <el-option label="无此项" value="无此项" />
-              </el-select>
+            <el-form-item label="规格" prop="bppguige">
+              <el-input v-model="param.bppguige" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item label="更换周期要求" prop="bppgenghuanzhouqiyaoqiu">
+              <el-input v-model="param.bppgenghuanzhouqiyaoqiu" :disabled="edit"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="9">
-            <el-form-item prop="bppexist">
-              <el-checkbox v-model="param.bppexist" label="设备本体无爆破片装置" true-label="设备本体无爆破片装置" border @change="changeBpp" />
+            <el-form-item label="更换日期" prop="bppgenghuariqi">
+              <el-input v-model="param.bppgenghuariqi" :disabled="edit"/>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item label="检验日期" label-width="135px" prop="bppjianyanriqi">
-              <el-input v-model="param.bppjianyanriqi" :disabled="edit || editBpp" />
+            <el-form-item label="安装位置" prop="bppanzhuangweizhi">
+              <el-input v-model="param.bppanzhuangweizhi" :disabled="edit"/>
             </el-form-item>
           </el-col>
         </el-row>
       </fieldset>
       <fieldset>
-        <legend>安全联锁装置</legend>
+        <legend>压力表</legend>
         <el-row :gutter="20">
           <el-col :span="9">
-            <el-form-item label="是否满足设计文件规定的使用技术要求" label-width="270px" prop="shifoumanzu">
-              <el-select v-model="param.shifoumanzu" filterable allow-create default-first-option placeholder="请选择" :disabled="edit || editAqls">
-                <el-option label="是" value="是" />
-                <el-option label="否" value="否" />
-                <el-option label="无此项" value="无此项" />
-              </el-select>
+            <el-form-item label="量程" prop="ylbliangcheng">
+              <el-input v-model="param.ylbliangcheng" :disabled="edit"><template slot="append">MPa</template></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item label="数量" prop="ylbshuliang">
+              <el-input v-model="param.ylbshuliang" :disabled="edit"><template slot="append">个</template></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="精度" prop="ylbjingdu">
+              <el-input v-model="param.ylbjingdu" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item label="检定日期" prop="ylbjiandingriqi">
+              <el-input v-model="param.ylbjiandingriqi" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="检定记录编号" prop="ylbjiandingbaogaobianhao">
+              <el-input v-model="param.ylbjiandingbaogaobianhao" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item label="安装位置" prop="ylbanzhuangweizhi">
+              <el-input v-model="param.ylbanzhuangweizhi" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </fieldset>
+      <fieldset>
+        <legend>紧急切断装置</legend>
+        <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="型式及规格" prop="jjqdzzxingshiguige">
+              <el-input v-model="param.jjqdzzxingshiguige" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item label="数量" prop="jjqdzzshuliang">
+              <el-input v-model="param.jjqdzzshuliang" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="耐压试验压力" prop="jjqdzznaiyashiyanyali">
+              <el-input v-model="param.jjqdzznaiyashiyanyali" :disabled="edit"><template slot="append">MPa</template></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item label="密闭试验压力" prop="jjqdzzmibishiyanyali">
+              <el-input v-model="param.jjqdzzmibishiyanyali" :disabled="edit"><template slot="append">MPa</template></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="切断时间" prop="jjqdzzqieduanshijian">
+              <el-input v-model="param.jjqdzzqieduanshijian" :disabled="edit"><template slot="append">S</template></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="aqlsexist">
-              <el-checkbox v-model="param.aqlsexist" label="设备本体无安全联锁装置" true-label="设备本体无安全联锁装置" border @change="changeAqls" />
+            <el-form-item label="检修记录" prop="jjqdzzjianxiujilu">
+              <el-input v-model="param.jjqdzzjianxiujilu" :disabled="edit"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="9">
-            <el-form-item label="检验日期" label-width="135px" prop="aqlsjianyanriqi">
-              <el-input v-model="param.aqlsjianyanriqi" :disabled="edit || editAqls" />
+            <el-form-item label="安装位置" prop="jjqdzzanzhuangweizhi">
+              <el-input v-model="param.jjqdzzanzhuangweizhi" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item label="外观" prop="jjqdzzwaiguan">
+              <el-input v-model="param.jjqdzzwaiguan" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </fieldset>
+      <fieldset>
+        <legend>液位（面）计</legend>
+        <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="型式" prop="ywjxingshi">
+              <el-input v-model="param.ywjxingshi" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item label="数量" prop="ywjshuliang">
+              <el-input v-model="param.ywjshuliang" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="容器充装量" prop="ywjrongqichongzhuangliang">
+              <el-input v-model="param.ywjrongqichongzhuangliang" :disabled="edit"><template slot="append">m³</template></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item label="安装位置" prop="ywjanzhuangweizhi">
+              <el-input v-model="param.ywjanzhuangweizhi" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="外观" prop="ywjwaiguan">
+              <el-input v-model="param.ywjwaiguan" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item label="误差" prop="ywjwucha">
+              <el-input v-model="param.ywjwucha" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </fieldset>
+      <fieldset>
+        <legend>测温仪表</legend>
+        <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="型号" prop="cwybxinghao">
+              <el-input v-model="param.cwybxinghao" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item label="有效期" prop="cwybyouxiaoqi">
+              <el-input v-model="param.cwybyouxiaoqi" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="外观" prop="cwybwaiguan">
+              <el-input v-model="param.cwybwaiguan" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </fieldset>
+      <fieldset>
+        <legend>气相软管</legend>
+        <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="试验压力" prop="qxrgshiyanyali">
+              <el-input v-model="param.qxrgshiyanyali" :disabled="edit"><template slot="append">MPa</template></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item label="试验介质" prop="qxrgshiyanjiezhi">
+              <el-input v-model="param.qxrgshiyanjiezhi" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="保压时间" prop="qxrgbaoyashijian">
+              <el-input v-model="param.qxrgbaoyashijian" :disabled="edit"><template slot="append">min</template></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </fieldset>
+      <fieldset>
+        <legend>液相软管</legend>
+        <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="试验压力" prop="yxrgshiyanyali">
+              <el-input v-model="param.yxrgshiyanyali" :disabled="edit"><template slot="append">MPa</template></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item label="试验介质" prop="yxrgshiyanjiezhi">
+              <el-input v-model="param.yxrgshiyanjiezhi" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="保压时间" prop="yxrgshiyanyali">
+              <el-input v-model="param.yxrgbaoyashijian" :disabled="edit"><template slot="append">min</template></el-input>
             </el-form-item>
           </el-col>
         </el-row>
       </fieldset>
       <fieldset>
         <legend>检验信息</legend>
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item label="其它阀门、附件检验" prop="qitajianyan" label-width="150px">
+              <el-input v-model="param.qitajianyan" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item label="检验结果" prop="jianyanjielun">
+              <el-select v-model="ysjl.jianyanjielun" :disabled="edit" type="text" placeholder="请选择" value="合格">
+                <el-option label="合格" value="合格"/>
+                <el-option label="不合格" value="不合格"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row :gutter="20">
           <el-col :span="9">
-            <el-form-item label="检验日期" label-width="135px" prop="jianyanjieshuriqi">
-              <el-date-picker v-model="ysjl.jianyanjieshuriqi" :disabled="edit" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" />
+            <el-form-item label="检验日期" prop="jianyanjieshuriqi">
+              <el-date-picker v-model="ysjl.jianyanjieshuriqi" :disabled="edit" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%;"/>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="检验结果" prop="jiancejieguo">
-          <el-input v-model="param.jiancejieguo" :disabled="edit" type="textarea" rows="4" style="width: 800px;" />
-        </el-form-item>
-        <el-form-item label="" prop="jianyanrenyuan" style="display: none;">
-          <el-input v-model="ysjl.jianyanrenyuan" type="text" />
-        </el-form-item>
       </fieldset>
     </el-form>
   </div>
@@ -123,23 +319,14 @@
 import Sticky from '@/components/Sticky'
 import btn from '@/views/common/FxButton'
 export default {
-  name: 'RqZbgAqfj2100',
+  name: 'RqAqfj',
   components: { Sticky, btn },
   data() {
     return {
       ysjl: {},
-      param: {
-        ywjwucha: '±',
-        ylbjiandingriqi: '年 月 日',
-        bppgenghuariqi: '年 月 日',
-        qitajianyan: '未见异常',
-        kuaikaimenjianyanjieguo: true
-      },
+      param: {},
       state: '',
       edit: false,
-      editAqf: false,
-      editBpp: false,
-      editAqls: false,
       ysjlId: this.$route.query.id,
       info: {
         ysjlId: this.$route.query.id,
@@ -169,26 +356,12 @@ export default {
           // 有无损原始记录参数
           this.state = 'update'
           this.param = data.param
-          this.changeAqf(this.param.aqfexist)
-          this.changeBpp(this.param.bppexist)
-          this.changeAqls(this.param.aqlsexist)
-        } else {
-          this.param = {
-            aqfjianyanriqi: this.ysjl.jianyanjieshuriqi,
-            bppjianyanriqi: this.ysjl.jianyanjieshuriqi,
-            aqlsjianyanriqi: this.ysjl.jianyanjieshuriqi
-          }
         }
         if (this.ysjl.flowstatus === 4) {
           this.state = 'finish'
           this.edit = true
         }
-        if (this.param.kuaikaimenjianyanjieguo === '☑满足设计文件规定的使用要求') {
-          this.param.kuaikaimenjianyanjieguo = true
-        } else {
-          this.param.kuaikaimenjianyanjieguo = false
-        }
-        this.$refs.btn.getParentInfo(this.ysjl, this.param, null, null, this.state, this.$route.query.jyxm, true, false)
+        this.$refs.btn.getParentInfo(this.ysjl, this.param, null, this.state, this.$route.query.jyxm)
       })
     },
     // 表格单击选中行
@@ -204,59 +377,6 @@ export default {
         this.delRowIndex.push(val[i].index)
       }
     },
-    changeAqf(val) {
-      if (val) {
-        this.editAqf = true
-        this.param.aqfshuliang = '无此项'
-        this.param.aqfyouxiaoqi = '无此项'
-        this.param.aqfjianyanriqi = '无此项'
-      } else {
-        this.editAqf = false
-        if (this.param.aqfshuliang === '无此项') {
-          this.param.aqfshuliang = ''
-        }
-        if (this.param.aqfyouxiaoqi === '无此项') {
-          this.param.aqfyouxiaoqi = ''
-        }
-        if (this.param.aqfjianyanriqi === '无此项') {
-          this.param.aqfjianyanriqi = this.ysjl.jianyanjieshuriqi
-        }
-      }
-    },
-    changeBpp(val) {
-      if (val) {
-        this.editBpp = true
-        this.param.bppshuliang = '无此项'
-        this.param.bppgenghuanzhouqiyaoqiu = '无此项'
-        this.param.bppjianyanriqi = '无此项'
-      } else {
-        this.editBpp = false
-        if (this.param.bppshuliang === '无此项') {
-          this.param.bppshuliang = ''
-        }
-        if (this.param.bppgenghuanzhouqiyaoqiu === '无此项') {
-          this.param.bppgenghuanzhouqiyaoqiu = ''
-        }
-        if (this.param.bppjianyanriqi === '无此项') {
-          this.param.bppjianyanriqi = this.ysjl.jianyanjieshuriqi
-        }
-      }
-    },
-    changeAqls(val) {
-      if (val) {
-        this.editAqls = true
-        this.param.shifoumanzu = '无此项'
-        this.param.aqlsjianyanriqi = '无此项'
-      } else {
-        this.editAqls = false
-        if (this.param.shifoumanzu === '无此项') {
-          this.param.shifoumanzu = ''
-        }
-        if (this.param.aqlsjianyanriqi === '无此项') {
-          this.param.aqlsjianyanriqi = this.ysjl.jianyanjieshuriqi
-        }
-      }
-    },
     beforeSaveBuildData() {
       // TODO
     }

From bfae974cd2e0c37e546b627a3515095ac3ffd2e8 Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Sat, 21 Aug 2021 15:34:47 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawerDialog/index.vue | 48 ++++++++++++++-------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/components/drawerDialog/index.vue b/src/components/drawerDialog/index.vue
index 6bc3664..b6a0964 100644
--- a/src/components/drawerDialog/index.vue
+++ b/src/components/drawerDialog/index.vue
@@ -57,8 +57,8 @@
                   placeholder="报告类型"
                   style="width: 215px"
                   clearable
+                  @change="getDicCodeList"
                 >
-                  <!-- @change="getDicCodeList" -->
                   <el-option
                     v-for="item in bglxList"
                     :key="item.value"
@@ -161,6 +161,7 @@
                   v-model="formTemplate.withDicCode"
                   placeholder="对应字典"
                   style="width: 420px"
+                  filterable
                   clearable
                 >
                   <el-option
@@ -176,6 +177,7 @@
                   v-model="formTemplate.parentId"
                   placeholder="父类模板"
                   style="width: 420px"
+                  filterable
                   clearable
                 >
                   <el-option
@@ -870,12 +872,12 @@ export default {
       if (this.id) {
         this.loadFormData(this.index)
         this.getList()
-      } else {
-        this.$refs['formTemplate'].resetFields()
+      } else if (this.$refs.formTemplate) {
+        this.$refs.formTemplate.resetFields()
         this.clearForm()
+        this.getBglxList()
       }
       this.getSbList(undefined, undefined, 1)
-      this.getBglxList()
       this.getJylbList()
       this.getTemplateIdentification()
     },
@@ -1023,10 +1025,6 @@ export default {
         }
       }
     },
-    handleSettingChange(row) {
-      this.moduleArr = row
-      // this.getDemoList(row.id)
-    },
     getTemplateIdentification() {
       this.api({
         url: '/dicData/getDicDataByTypeCode',
@@ -1061,7 +1059,7 @@ export default {
       )
     },
     getBglxList() {
-      this.api({
+      return this.api({
         url: '/dicData/getDicDataByTypeCode',
         method: 'get',
         params: {
@@ -1122,20 +1120,24 @@ export default {
         }
       })
     },
-    getDicCodeList(val) {
-      for (let i = 0; i < this.bglxList.length; i++) {
-        if (val === 1) {
-          this.dicCodeList = []
-          break
-        } else if (val === this.bglxList[i].value) {
-          this.getDicDataByTypeCode(
-            this.bglxList[i].code,
-            'dicCode',
-            this.bglxList[i].id
-          )
-          break
-        }
+    getDicCodeList(val, resetWithDicCode) {
+      // 0. 重置对应字典数据
+      if (resetWithDicCode) {
+        this.formTemplate.withDicCode = undefined
+      }
+      // 1. 主报告无对应字典数据
+      if (val === 1) {
+        this.dicCodeList = []
+        return
+      }
+      // 2. 筛选出当期报告类型数据，如果不存在则结束
+      const bglxs = this.bglxList.filter(row => row.value === val)
+      if (!bglxs.length) {
+        return
       }
+      // 3. 获取对应报告类型字典数据
+      const bglx = bglxs[0]
+      this.getDicDataByTypeCode(bglx.code, 'dicCode', bglx.id)
     },
     getNeibuList(type, parentCode, species) {
       this.api({
@@ -1169,7 +1171,7 @@ export default {
         this.formTemplate.shebeipinzhongdaima
       )
       this.neibuleibie = JSON.parse(this.formTemplate.neibuleibie)
-      this.getDicCodeList(this.formTemplate.bglx)
+      this.getBglxList().then(() => this.getDicCodeList(this.formTemplate.bglx, false))
       this.getNeibuList(
         'nblb',
         this.formTemplate.jianyanleibie,

From df226addeb44decc1168af99d92a12b49c670a68 Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Mon, 23 Aug 2021 08:36:05 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ysjl/2000/2100/fenxiang/aqfj.vue | 142 ++++++++++++++-------
 1 file changed, 97 insertions(+), 45 deletions(-)

diff --git a/src/views/ysjl/2000/2100/fenxiang/aqfj.vue b/src/views/ysjl/2000/2100/fenxiang/aqfj.vue
index 5aca364..b6985a2 100644
--- a/src/views/ysjl/2000/2100/fenxiang/aqfj.vue
+++ b/src/views/ysjl/2000/2100/fenxiang/aqfj.vue
@@ -17,36 +17,44 @@
         <el-row :gutter="20">
           <el-col :span="9">
             <el-form-item label="型号" prop="aqfxinghao">
-              <el-input v-model="param.aqfxinghao" :disabled="edit"/>
+              <el-input v-model="param.aqfxinghao" :disabled="edit" />
             </el-form-item>
           </el-col>
           <el-col :span="9">
             <el-form-item label="数量" prop="aqfshuliang">
-              <el-input v-model="param.aqfshuliang" :disabled="edit"><template slot="append">台</template></el-input>
+              <el-input v-model="param.aqfshuliang" :disabled="edit">
+                <template slot="append">
+                  台
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="9">
             <el-form-item label="校验日期" prop="aqfjianyanriqi">
-              <el-input v-model="param.aqfjianyanriqi" :disabled="edit"/>
+              <el-input v-model="param.aqfjianyanriqi" :disabled="edit" />
             </el-form-item>
           </el-col>
           <el-col :span="9">
             <el-form-item label="校验报告编号" prop="aqfjiaoyanbaogaobianhao">
-              <el-input v-model="param.aqfjiaoyanbaogaobianhao" :disabled="edit"/>
+              <el-input v-model="param.aqfjiaoyanbaogaobianhao" :disabled="edit" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="9">
             <el-form-item label="整定压力" prop="aqfzhengdingyali">
-              <el-input v-model="param.aqfzhengdingyali" :disabled="edit"><template slot="append">MPa</template></el-input>
+              <el-input v-model="param.aqfzhengdingyali" :disabled="edit">
+                <template slot="append">
+                  MPa
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="9">
             <el-form-item label="安装位置" prop="aqfanzhuangweizhi">
-              <el-input v-model="param.aqfanzhuangweizhi" :disabled="edit"/>
+              <el-input v-model="param.aqfanzhuangweizhi" :disabled="edit" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -56,36 +64,40 @@
         <el-row :gutter="20">
           <el-col :span="9">
             <el-form-item label="型号" prop="bppxinghao">
-              <el-input v-model="param.bppxinghao" :disabled="edit"/>
+              <el-input v-model="param.bppxinghao" :disabled="edit" />
             </el-form-item>
           </el-col>
           <el-col :span="9">
             <el-form-item label="数量" prop="bppshuliang">
-              <el-input v-model="param.bppshuliang" :disabled="edit"><template slot="append">个</template></el-input>
+              <el-input v-model="param.bppshuliang" :disabled="edit">
+                <template slot="append">
+                  个
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="9">
             <el-form-item label="规格" prop="bppguige">
-              <el-input v-model="param.bppguige" :disabled="edit"/>
+              <el-input v-model="param.bppguige" :disabled="edit" />
             </el-form-item>
           </el-col>
           <el-col :span="9">
             <el-form-item label="更换周期要求" prop="bppgenghuanzhouqiyaoqiu">
-              <el-input v-model="param.bppgenghuanzhouqiyaoqiu" :disabled="edit"/>
+              <el-input v-model="param.bppgenghuanzhouqiyaoqiu" :disabled="edit" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="9">
             <el-form-item label="更换日期" prop="bppgenghuariqi">
-              <el-input v-model="param.bppgenghuariqi" :disabled="edit"/>
+              <el-input v-model="param.bppgenghuariqi" :disabled="edit" />
             </el-form-item>
           </el-col>
           <el-col :span="9">
             <el-form-item label="安装位置" prop="bppanzhuangweizhi">
-              <el-input v-model="param.bppanzhuangweizhi" :disabled="edit"/>
+              <el-input v-model="param.bppanzhuangweizhi" :disabled="edit" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -95,36 +107,44 @@
         <el-row :gutter="20">
           <el-col :span="9">
             <el-form-item label="量程" prop="ylbliangcheng">
-              <el-input v-model="param.ylbliangcheng" :disabled="edit"><template slot="append">MPa</template></el-input>
+              <el-input v-model="param.ylbliangcheng" :disabled="edit">
+                <template slot="append">
+                  MPa
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="9">
             <el-form-item label="数量" prop="ylbshuliang">
-              <el-input v-model="param.ylbshuliang" :disabled="edit"><template slot="append">个</template></el-input>
+              <el-input v-model="param.ylbshuliang" :disabled="edit">
+                <template slot="append">
+                  个
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="9">
             <el-form-item label="精度" prop="ylbjingdu">
-              <el-input v-model="param.ylbjingdu" :disabled="edit"/>
+              <el-input v-model="param.ylbjingdu" :disabled="edit" />
             </el-form-item>
           </el-col>
           <el-col :span="9">
             <el-form-item label="检定日期" prop="ylbjiandingriqi">
-              <el-input v-model="param.ylbjiandingriqi" :disabled="edit"/>
+              <el-input v-model="param.ylbjiandingriqi" :disabled="edit" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="9">
             <el-form-item label="检定记录编号" prop="ylbjiandingbaogaobianhao">
-              <el-input v-model="param.ylbjiandingbaogaobianhao" :disabled="edit"/>
+              <el-input v-model="param.ylbjiandingbaogaobianhao" :disabled="edit" />
             </el-form-item>
           </el-col>
           <el-col :span="9">
             <el-form-item label="安装位置" prop="ylbanzhuangweizhi">
-              <el-input v-model="param.ylbanzhuangweizhi" :disabled="edit"/>
+              <el-input v-model="param.ylbanzhuangweizhi" :disabled="edit" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -134,48 +154,60 @@
         <el-row :gutter="20">
           <el-col :span="9">
             <el-form-item label="型式及规格" prop="jjqdzzxingshiguige">
-              <el-input v-model="param.jjqdzzxingshiguige" :disabled="edit"/>
+              <el-input v-model="param.jjqdzzxingshiguige" :disabled="edit" />
             </el-form-item>
           </el-col>
           <el-col :span="9">
             <el-form-item label="数量" prop="jjqdzzshuliang">
-              <el-input v-model="param.jjqdzzshuliang" :disabled="edit"/>
+              <el-input v-model="param.jjqdzzshuliang" :disabled="edit" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="9">
             <el-form-item label="耐压试验压力" prop="jjqdzznaiyashiyanyali">
-              <el-input v-model="param.jjqdzznaiyashiyanyali" :disabled="edit"><template slot="append">MPa</template></el-input>
+              <el-input v-model="param.jjqdzznaiyashiyanyali" :disabled="edit">
+                <template slot="append">
+                  MPa
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="9">
             <el-form-item label="密闭试验压力" prop="jjqdzzmibishiyanyali">
-              <el-input v-model="param.jjqdzzmibishiyanyali" :disabled="edit"><template slot="append">MPa</template></el-input>
+              <el-input v-model="param.jjqdzzmibishiyanyali" :disabled="edit">
+                <template slot="append">
+                  MPa
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="9">
             <el-form-item label="切断时间" prop="jjqdzzqieduanshijian">
-              <el-input v-model="param.jjqdzzqieduanshijian" :disabled="edit"><template slot="append">S</template></el-input>
+              <el-input v-model="param.jjqdzzqieduanshijian" :disabled="edit">
+                <template slot="append">
+                  S
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="9">
             <el-form-item label="检修记录" prop="jjqdzzjianxiujilu">
-              <el-input v-model="param.jjqdzzjianxiujilu" :disabled="edit"/>
+              <el-input v-model="param.jjqdzzjianxiujilu" :disabled="edit" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="9">
             <el-form-item label="安装位置" prop="jjqdzzanzhuangweizhi">
-              <el-input v-model="param.jjqdzzanzhuangweizhi" :disabled="edit"/>
+              <el-input v-model="param.jjqdzzanzhuangweizhi" :disabled="edit" />
             </el-form-item>
           </el-col>
           <el-col :span="9">
             <el-form-item label="外观" prop="jjqdzzwaiguan">
-              <el-input v-model="param.jjqdzzwaiguan" :disabled="edit"/>
+              <el-input v-model="param.jjqdzzwaiguan" :disabled="edit" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -185,36 +217,40 @@
         <el-row :gutter="20">
           <el-col :span="9">
             <el-form-item label="型式" prop="ywjxingshi">
-              <el-input v-model="param.ywjxingshi" :disabled="edit"/>
+              <el-input v-model="param.ywjxingshi" :disabled="edit" />
             </el-form-item>
           </el-col>
           <el-col :span="9">
             <el-form-item label="数量" prop="ywjshuliang">
-              <el-input v-model="param.ywjshuliang" :disabled="edit"/>
+              <el-input v-model="param.ywjshuliang" :disabled="edit" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="9">
             <el-form-item label="容器充装量" prop="ywjrongqichongzhuangliang">
-              <el-input v-model="param.ywjrongqichongzhuangliang" :disabled="edit"><template slot="append">m³</template></el-input>
+              <el-input v-model="param.ywjrongqichongzhuangliang" :disabled="edit">
+                <template slot="append">
+                  m³
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="9">
             <el-form-item label="安装位置" prop="ywjanzhuangweizhi">
-              <el-input v-model="param.ywjanzhuangweizhi" :disabled="edit"/>
+              <el-input v-model="param.ywjanzhuangweizhi" :disabled="edit" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="9">
             <el-form-item label="外观" prop="ywjwaiguan">
-              <el-input v-model="param.ywjwaiguan" :disabled="edit"/>
+              <el-input v-model="param.ywjwaiguan" :disabled="edit" />
             </el-form-item>
           </el-col>
           <el-col :span="9">
             <el-form-item label="误差" prop="ywjwucha">
-              <el-input v-model="param.ywjwucha" :disabled="edit"/>
+              <el-input v-model="param.ywjwucha" :disabled="edit" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -224,19 +260,19 @@
         <el-row :gutter="20">
           <el-col :span="9">
             <el-form-item label="型号" prop="cwybxinghao">
-              <el-input v-model="param.cwybxinghao" :disabled="edit"/>
+              <el-input v-model="param.cwybxinghao" :disabled="edit" />
             </el-form-item>
           </el-col>
           <el-col :span="9">
             <el-form-item label="有效期" prop="cwybyouxiaoqi">
-              <el-input v-model="param.cwybyouxiaoqi" :disabled="edit"/>
+              <el-input v-model="param.cwybyouxiaoqi" :disabled="edit" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="9">
             <el-form-item label="外观" prop="cwybwaiguan">
-              <el-input v-model="param.cwybwaiguan" :disabled="edit"/>
+              <el-input v-model="param.cwybwaiguan" :disabled="edit" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -246,19 +282,27 @@
         <el-row :gutter="20">
           <el-col :span="9">
             <el-form-item label="试验压力" prop="qxrgshiyanyali">
-              <el-input v-model="param.qxrgshiyanyali" :disabled="edit"><template slot="append">MPa</template></el-input>
+              <el-input v-model="param.qxrgshiyanyali" :disabled="edit">
+                <template slot="append">
+                  MPa
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="9">
             <el-form-item label="试验介质" prop="qxrgshiyanjiezhi">
-              <el-input v-model="param.qxrgshiyanjiezhi" :disabled="edit"/>
+              <el-input v-model="param.qxrgshiyanjiezhi" :disabled="edit" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="9">
             <el-form-item label="保压时间" prop="qxrgbaoyashijian">
-              <el-input v-model="param.qxrgbaoyashijian" :disabled="edit"><template slot="append">min</template></el-input>
+              <el-input v-model="param.qxrgbaoyashijian" :disabled="edit">
+                <template slot="append">
+                  min
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -268,19 +312,27 @@
         <el-row :gutter="20">
           <el-col :span="9">
             <el-form-item label="试验压力" prop="yxrgshiyanyali">
-              <el-input v-model="param.yxrgshiyanyali" :disabled="edit"><template slot="append">MPa</template></el-input>
+              <el-input v-model="param.yxrgshiyanyali" :disabled="edit">
+                <template slot="append">
+                  MPa
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="9">
             <el-form-item label="试验介质" prop="yxrgshiyanjiezhi">
-              <el-input v-model="param.yxrgshiyanjiezhi" :disabled="edit"/>
+              <el-input v-model="param.yxrgshiyanjiezhi" :disabled="edit" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="9">
             <el-form-item label="保压时间" prop="yxrgshiyanyali">
-              <el-input v-model="param.yxrgbaoyashijian" :disabled="edit"><template slot="append">min</template></el-input>
+              <el-input v-model="param.yxrgbaoyashijian" :disabled="edit">
+                <template slot="append">
+                  min
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -290,7 +342,7 @@
         <el-row :gutter="20">
           <el-col :span="18">
             <el-form-item label="其它阀门、附件检验" prop="qitajianyan" label-width="150px">
-              <el-input v-model="param.qitajianyan" :disabled="edit"/>
+              <el-input v-model="param.qitajianyan" :disabled="edit" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -298,8 +350,8 @@
           <el-col :span="18">
             <el-form-item label="检验结果" prop="jianyanjielun">
               <el-select v-model="ysjl.jianyanjielun" :disabled="edit" type="text" placeholder="请选择" value="合格">
-                <el-option label="合格" value="合格"/>
-                <el-option label="不合格" value="不合格"/>
+                <el-option label="合格" value="合格" />
+                <el-option label="不合格" value="不合格" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -307,7 +359,7 @@
         <el-row :gutter="20">
           <el-col :span="9">
             <el-form-item label="检验日期" prop="jianyanjieshuriqi">
-              <el-date-picker v-model="ysjl.jianyanjieshuriqi" :disabled="edit" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%;"/>
+              <el-date-picker v-model="ysjl.jianyanjieshuriqi" :disabled="edit" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%;" />
             </el-form-item>
           </el-col>
         </el-row>

From a3c5eb59b5c6e493d9975769cc52365be157b247 Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Mon, 23 Aug 2021 08:37:27 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E4=BD=BF=E7=94=A8Notification=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=E5=8E=9FMessage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/apibjd.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/utils/apibjd.js b/src/utils/apibjd.js
index c12d0e5..e6ae09d 100644
--- a/src/utils/apibjd.js
+++ b/src/utils/apibjd.js
@@ -1,5 +1,5 @@
 import axios from 'axios'
-import { Message } from 'element-ui'
+import { Notification } from 'element-ui'
 import store from '../store'
 import { showLoading, hideLoading } from './apiHelper'
 // 创建axios实例
@@ -36,7 +36,7 @@ service.interceptors.response.use(
           if (res.data.returnCode === 1) {
             return res.data.returnData
           } else if (res.data.returnCode === '20011') {
-            Message({
+            Notification({
               showClose: true,
               message: res.returnMsg,
               type: 'error',
@@ -49,7 +49,7 @@ service.interceptors.response.use(
             })
             return Promise.reject('未登录')
           } else {
-            Message({
+            Notification({
               message: res.data.returnMsg || '请求处理异常，请稍后再试',
               type: 'error',
               duration: 3 * 1000
@@ -64,7 +64,7 @@ service.interceptors.response.use(
     } if (res.returnCode === 1) {
       return res.returnData
     } else if (res.returnCode === '20011') {
-      Message({
+      Notification({
         showClose: true,
         message: res.returnMsg,
         type: 'error',
@@ -88,7 +88,7 @@ service.interceptors.response.use(
       if (res.data && res.data.constructor === String) {
         msg = msg ? msg + '：' + res.data : res.data
       }
-      Message({
+      Notification({
         message: msg,
         type: 'error',
         duration: 3 * 1000
@@ -99,8 +99,8 @@ service.interceptors.response.use(
   error => {
     hideLoading()
     console.error('err' + error) // for debug
-    Message({
-      message: error.response.data.msg,
+    Notification({
+      message: error.response.data && error.response.data.message ? error.response.data.message : error.message,
       type: 'error',
       duration: 3 * 1000
     })