From 99fee9cae293385eb69ec16ffa1cf96fc41fbdf2 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Fri, 18 Oct 2024 16:15:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=AE=A1=E7=90=86-=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/base/base.js                     |  2 +-
 src/views/base/comeAndGo/index.vue       |  1 -
 src/views/base/unit/index.vue            | 15 +++++++++++++--
 src/views/materialsManage/type/index.vue | 12 ++++++------
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/api/base/base.js b/src/api/base/base.js
index 060fa27..0b21d44 100644
--- a/src/api/base/base.js
+++ b/src/api/base/base.js
@@ -123,7 +123,7 @@ export function delUnit(unitId) {
 // 往来单位-人员配置-左侧人员
 export function getUserList(query) {
   return request({
-    url: '/material/bm_unit_person/getDeptUserTree',
+    url: '/system/user/deptUserTree',
     method: 'get',
     params: query
   })
diff --git a/src/views/base/comeAndGo/index.vue b/src/views/base/comeAndGo/index.vue
index 6a4b7c9..b19bd66 100644
--- a/src/views/base/comeAndGo/index.vue
+++ b/src/views/base/comeAndGo/index.vue
@@ -206,7 +206,6 @@
                             :key="item.typeId"
                             :label="item.typeName"
                             :value="item.typeId"
-                          
                         ></el-option>
                     </el-select>
                 </el-form-item>
diff --git a/src/views/base/unit/index.vue b/src/views/base/unit/index.vue
index 595f792..1baa8af 100644
--- a/src/views/base/unit/index.vue
+++ b/src/views/base/unit/index.vue
@@ -192,7 +192,6 @@
         <el-form-item label="权限范围">
           <el-select
             v-model="form.dataScope"
-            @change="dataScopeSelectChange"
           >
             <el-option
               v-for="item in dataScopeOptions"
@@ -256,6 +255,10 @@ export default {
   dicts: ['sys_normal_disable'],
   data() {
     return {
+      deptExpand:undefined,
+      deptNodeAll:undefined,
+      deptOptions:[],
+      defaultProps:undefined,
       isLoading: false,
       // 遮罩层
       loading: true,
@@ -275,6 +278,8 @@ export default {
       title: '',
       typeId:'',
       // 是否显示弹出层
+      openDataScope:false,
+      dataScopeOptions:[],
       open: false,
       // 日期范围
       dateRange: [],
@@ -316,9 +321,15 @@ export default {
       this.loading = true
       unitTypeList(this.queryParams).then((response) => {
         this.roleList = response.data.rows
-        this.total = response.data.total
+        // this.total = response.data.total
         this.loading = false
       })
+    },
+    submitDataScope(){
+
+    },
+    cancelDataScope(){
+
     },
     // 取消按钮
     cancel() {
diff --git a/src/views/materialsManage/type/index.vue b/src/views/materialsManage/type/index.vue
index 8510ceb..3e5f133 100644
--- a/src/views/materialsManage/type/index.vue
+++ b/src/views/materialsManage/type/index.vue
@@ -309,9 +309,9 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="计量单位" prop="unitId">
+                        <el-form-item label="计量单位" prop="unitName">
                             <el-input
-                                v-model="form.unitId"
+                                v-model="form.unitName"
                                 type="number"
                                 placeholder="请输入计量单位"
                                 maxlength="30"
@@ -399,9 +399,9 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="6">
-                        <el-form-item label="赔偿价(元)" prop="unitName" label-width="130px">
+                        <el-form-item label="赔偿价(元)" prop="payPrice" label-width="130px">
                             <el-input
-                                v-model="form.unitName"
+                                v-model="form.payPrice"
                                 placeholder="请输入"
                                 maxlength="20"
                                 style="width: 110px;"
@@ -471,9 +471,9 @@
                     </el-col>
 
                     <el-col :span="6">
-                        <el-form-item label="检验周期" prop="unitName">
+                        <el-form-item label="检验周期" prop="testCycle">
                             <el-input
-                                v-model="form.unitName"
+                                v-model="form.testCycle"
                                 placeholder="请输入"
                                 maxlength="20"
                                 style="width: 110px;"