更改首页样式冲突，完成营具模块

src/views/login.vue

@@ -8,7 +8,7 @@
     >
       <!-- <img src="../images/dibu1.png" alt="" class="img" /> -->
       <!-- <h3 class="title">智能督察管理平台</h3> -->
-      <el-form-item prop="username" >
+      <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
           type="text"
@@ -22,7 +22,7 @@
           />
         </el-input>
       </el-form-item>
-      <el-form-item prop="password" >
+      <el-form-item prop="password">
         <el-input
           v-model="loginForm.password"
           type="password"
@@ -187,7 +187,7 @@ export default {
 };
 </script>
 
-<style rel="stylesheet/scss" lang="scss">
+<style rel="stylesheet/scss" lang="scss" scoped>
 .login {
   display: flex;
   justify-content: center;
@@ -201,14 +201,16 @@ export default {
   text-align: center;
   color: #01cfff;
 }
-
+::v-deep .login-form .el-input {
+  width: 390px;
+}
 .login-form {
   position: relative;
   border-radius: 6px;
   width: 1059px;
   height: 604px;
   padding: 180px 56px 50px 79px;
-  background: url("../assets/images/边框.png") no-repeat ;
+  background: url("../assets/images/边框.png") no-repeat;
   background-size: cover;
   .el-input {
     height: 38px;
@@ -223,13 +225,13 @@ export default {
     height: 39px;
     width: 14px;
     margin-left: 2px;
-    margin-top:4px;
-    color: #01CFFF;
+    margin-top: 4px;
+    color: #01cfff;
   }
 }
-.el-form-item__error{
-   margin-left: 510px;
-   margin-top:15px !important;
+.el-form-item__error {
+  margin-left: 510px;
+  margin-top: 15px !important;
 }
 .login-tip {
   font-size: 13px;
@@ -274,9 +276,7 @@ export default {
   color: #fff;
   border: 1px solid #01cfff;
 }
-.el-form-item__error {
-  left: 510px !important;
-}
+
 .img {
   position: absolute;
   bottom: -25px;
@@ -287,4 +287,21 @@ export default {
   margin-bottom: 40px;
   margin-top: 30px;
 }
+::v-deep .el-form-item__error {
+  margin-left: 510px !important;
+  margin-top: 10px !important;
+}
+.el-form-item {
+  margin-bottom: 40px !important;
+}
+::v-deep .el-form-item.is-error .el-input__inner {
+  background-color: transparent !important;
+  height: 46px;
+}
+::v-deep .el-input--medium .el-input__inner {
+  color: #fff;
+  background-color: transparent !important;
+  height: 46px;
+  border: 1px solid #01cfff;
+}
 </style>

src/views/materialManagement/distribution/index.vue

@@ -521,15 +521,18 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="接收人" prop="recipientId" v-if="ren">
-          <el-select v-model="form.recipientId" placeholder="请选择接收人">
+        <el-form-item label="接收人" prop="recipient" v-if="ren">
+          <el-select
+            v-model="form.recipient"
+            placeholder="请选择接收人"
+            @change="rens"
+          >
             <el-option
               v-for="item in renYuan"
               :key="item.id"
               :label="item.name"
-              :value="item.id"
+              :value="item"
               class="input_xiala"
-              @click.native="rens(item.name)"
             >
             </el-option>
           </el-select>
@@ -693,8 +696,10 @@ export default {
       this.form.outUnit = data.label;
     },
     // 点击选择接收人触发
-    rens(name) {
-      this.form.resipient = name;
+    rens(data) {
+      this.form.recipientId = data.id;
+      console.log(data);
+      this.$set(this.form, "recipient", data.name);
     },
     // 点击发放对象
     dianJi(value) {
@@ -703,12 +708,12 @@ export default {
         this.danWei = false;
         this.ren = true;
         this.form.outUnitId = null;
-        this.form.outUnit = null;
+        this.form.outUnit = "";
       } else if (value == "2") {
         this.ren = false;
         this.danWei = true;
-        this.form.resipient = null;
-        this.form.recipientId = null;
+        this.form.recipient = "";
+        this.form.recipientId = "";
       }
     },
     // 获取人员
@@ -725,7 +730,7 @@ export default {
     },
     // 点击物品名称触发
     wuPing(data) {
-      console.log(data);
+      // console.log(data);
       this.form.responsibilityUnit = data.responsibilityUnit;
       this.form.price = data.price;
       this.form.archivesId = data.archivesId;

src/views/materialManagement/materialRegistration/index.vue

@@ -401,7 +401,11 @@
           />
         </el-form-item>
         <el-form-item label="物品型号" prop="materialXh">
-          <el-input v-model="form.materialXh" placeholder="请输入物品型号" />
+          <el-input
+            v-model="form.materialXh"
+            placeholder="请输入物品型号"
+            readonly
+          />
         </el-form-item>
         <!-- <el-form-item label="营具类型" prop="yingJuType">
           <el-select v-model="form.yingJuType" placeholder="请选择营具类型">
@@ -587,8 +591,9 @@ export default {
     },
     // 点击物品名称触发
     wuPing(data) {
-      console.log(data);
+      // console.log(data);
       this.form.archivesId = data.id;
+      this.form.materialXh = data.materialXh;
       this.form.responsibilityUnit = data.responsibilityUnit;
       this.form.unitId = data.unitId;
       this.planName();

src/views/materialManagement/propertyChange/index.vue

@@ -321,19 +321,25 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="变更前所属单位" prop="beforeUnitId">
-          <!-- <el-select
-            v-model="form.beforeUnitId"
-            placeholder="请输入"
-          ></el-select> -->
-          <treeselect
+          <el-input
+            placeholder="请输入变更前所属单位"
+            v-model="form.beforeUnitName"
+            readonly
+          />
+          <!-- <treeselect
             v-model="form.beforeUnitId"
             placeholder="请选择变更前所属单位"
             :options="deptOptions"
             @select="danWei1"
-          ></treeselect>
+          ></treeselect> -->
         </el-form-item>
         <el-form-item label="变更前人员名称" prop="beforePeopleId">
-          <el-select
+          <el-input
+            placeholder="请输入变更前人员名称"
+            v-model="form.beforePeopleName"
+            readonly
+          />
+          <!-- <el-select
             v-model="form.beforePeopleId"
             placeholder="请输入变更前人员名称"
           >
@@ -346,7 +352,7 @@
               @click.native="rens1(item.name)"
             >
             </el-option>
-          </el-select>
+          </el-select> -->
         </el-form-item>
         <el-form-item label="变更后所属单位" prop="afterUnitId">
           <!-- <el-select
@@ -502,7 +508,11 @@ export default {
   methods: {
     // 物品名称触发
     wuPing(data) {
-      // console.log(data);
+      console.log(data);
+      this.form.beforeUnitName = data.responsibilityUnit;
+      this.form.beforeUnitId = data.unitId;
+      this.form.beforePeopleName = data.personLiable;
+      this.form.beforePeopleId = data.personLiableId;
       this.form.propertyId = data.id;
       this.planName();
     },
@@ -522,7 +532,6 @@ export default {
     },
     // 点击选择接收人触发
     rens1(name) {
-      console.log(name);
       this.form.beforePeopleName = name;
     },
     rens2(name) {

src/views/system/user/index.vue

@@ -14,8 +14,8 @@
         </div>
         <div class="head-container">
           <el-tree
-        class="userAgrees"
-         style = "height:700px;overflow:auto;"
+            class="userAgrees"
+            style="height: 700px; overflow: auto"
             :data="deptOptions"
             :props="defaultProps"
             :expand-on-click-node="false"
@@ -460,6 +460,7 @@
                 v-model="form.permissions"
                 style="width: 200px"
                 placeholder="请选择权限"
+                clearable
               >
                 <el-option
                   v-for="dict in permissionslist"