Selaa lähdekoodia

完成了营具管理档案,营具所有页面的布局

sunyanqiang 3 vuotta sitten
vanhempi
commit
75f08ad6b8

+ 7 - 9
src/views/materialManagement/archives/index.vue

@@ -224,11 +224,11 @@
       </el-table-column>
       <el-table-column label="物品名称" align="center" prop="name" />
       <el-table-column
-        label="物规格"
+        label="物规格"
         align="center"
         prop="materialSpecification"
       />
-      <el-table-column label="物型号" align="center" prop="materialXh" />
+      <el-table-column label="物型号" align="center" prop="materialXh" />
       <el-table-column label="营具类型" align="center" prop="yingJuType">
         <template slot-scope="scope">
           <dict-tag
@@ -250,7 +250,7 @@
         prop="materialInventory"
       />
       <el-table-column label="在用数量" align="center" prop="inUseTotal" />
-      <el-table-column label="创建人" align="center" prop="userName" />
+      <!-- <el-table-column label="创建人" align="center" prop="userName" /> -->
       <!-- <el-table-column label="库房" align="center" prop="warehouse" />
       <el-table-column label="单位id" align="center" prop="unitId" />
       <el-table-column label="责任人id" align="center" prop="personLiableId" /> -->
@@ -314,14 +314,14 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="物规格" prop="materialSpecification">
+        <el-form-item label="物规格" prop="materialSpecification">
           <el-input
             v-model="form.materialSpecification"
-            placeholder="请输入物规格"
+            placeholder="请输入物规格"
           />
         </el-form-item>
-        <el-form-item label="物型号" prop="materialXh">
-          <el-input v-model="form.materialXh" placeholder="请输入物型号" />
+        <el-form-item label="物型号" prop="materialXh">
+          <el-input v-model="form.materialXh" placeholder="请输入物型号" />
         </el-form-item>
         <el-form-item label="营具类型" prop="yingJuType">
           <el-select v-model="form.yingJuType" placeholder="请选择营具类型">
@@ -341,7 +341,6 @@
             :options="deptOptions"
             @select="shuxing"
           ></treeselect>
-          <!-- <el-option label="请选择字典生成" value="" /> -->
         </el-form-item>
 
         <el-form-item label="责任人" prop="personLiableId">
@@ -355,7 +354,6 @@
               @click.native="xingMing(item.name)"
             >
             </el-option>
-            <!-- <el-option label="请选择字典生成" value="" /> -->
           </el-select>
         </el-form-item>
 

+ 13 - 2
src/views/materialManagement/distribution/index.vue

@@ -501,11 +501,11 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="接收人" prop="recipientId">
+        <el-form-item label="接收人" prop="recipientId" v-if="ren">
           <el-select v-model="form.recipientId" placeholder="请选择接收人">
           </el-select>
         </el-form-item>
-        <el-form-item label="接收单位" prop="outUnitId">
+        <el-form-item label="接收单位" prop="outUnitId" v-if="danWei">
           <treeselect
             v-model="form.outUnitId"
             placeholder="请选择接收单位"
@@ -642,6 +642,10 @@ export default {
       itemlist: [],
       // 树形单位
       deptOptions: [],
+      // 显示与隐藏接收人
+      ren: true,
+      // 显示与隐藏接收单位
+      danWei: false,
     };
   },
   created() {
@@ -651,6 +655,13 @@ export default {
     // 点击发放对象
     dianJi(value) {
       console.log(value);
+      if (value == "0") {
+        this.danWei = false;
+        this.ren = true;
+      } else if (value == "2") {
+        this.ren = false;
+        this.danWei = true;
+      }
     },
     // 点击单位触发
     shuxing(data) {

+ 43 - 6
src/views/materialManagement/materialRegistration/index.vue

@@ -258,11 +258,11 @@
       </el-table-column> -->
       <el-table-column label="物品名称" align="center" prop="name" />
       <el-table-column
-        label="物规格"
+        label="物规格"
         align="center"
         prop="materialSpecification"
       />
-      <el-table-column label="物型号" align="center" prop="materialXh" />
+      <el-table-column label="物型号" align="center" prop="materialXh" />
       <!-- <el-table-column label="营具类型" align="center" prop="yingJuType">
         <template slot-scope="scope">
           <dict-tag
@@ -385,14 +385,22 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="物规格" prop="materialSpecification">
+        <el-form-item label="物规格" prop="materialSpecification">
           <el-input
             v-model="form.materialSpecification"
-            placeholder="请输入物规格"
+            placeholder="请输入物规格"
           />
         </el-form-item>
-        <el-form-item label="物资型号" prop="materialXh">
-          <el-input v-model="form.materialXh" placeholder="请输入物资型号" />
+        <el-form-item label="物品型号" prop="materialXh">
+          <el-input v-model="form.materialXh" placeholder="请输入物品型号" />
+        </el-form-item>
+        <el-form-item label="责任单位" prop="unitId">
+          <treeselect
+            v-model="form.unitId"
+            placeholder="请选择责任单位"
+            :options="deptOptions"
+            @select="shuxing"
+          ></treeselect>
         </el-form-item>
         <!-- <el-form-item label="营具类型" prop="yingJuType">
           <el-select v-model="form.yingJuType" placeholder="请选择营具类型">
@@ -490,13 +498,20 @@ import {
   updateMaterialRegistration,
   exportMaterialRegistration,
 } from "@/api/materialManagement/materialRegistration";
+import { getDept } from "@/api/materialManagement/archives";
 import { listArchives } from "@/api/materialManagement/archives";
 // 所有人员
 import { getAll } from "@/api/grassrootsregistration/bdglmeeting";
+// 导入树形结构
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "MaterialRegistration",
   dicts: ["category", "storage_room", "camp_equipment"],
+  components: {
+    Treeselect,
+  },
   data() {
     return {
       // 遮罩层
@@ -548,6 +563,8 @@ export default {
       itemlist: [],
       // 外面的人员
       renYuans: [],
+      // 树形单位
+      deptOptions: [],
     };
   },
   created() {
@@ -555,6 +572,18 @@ export default {
     this.getSuo();
   },
   methods: {
+    // 点击单位触发
+    shuxing(data) {
+      // this.form.unitId = data.id;
+      // this.form.responsibilityUnit = data.label;
+      // this.getRenYuan(this.form.unitId);
+    },
+    /** 查询部门下拉树结构 */
+    getTreeselect() {
+      getDept().then((response) => {
+        this.deptOptions = response.data;
+      });
+    },
     // 获取搜索所有人
     getSuo() {
       getAll().then((res) => {
@@ -632,6 +661,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      this.getTreeselect();
       this.getMingCheng();
       this.reset();
       this.open = true;
@@ -756,4 +786,11 @@ export default {
   height: 36px !important;
   color: #fff;
 }
+/* 单位框背景颜色 */
+::v-deep .vue-treeselect__control {
+  background: #004d86 !important;
+}
+::v-deep .vue-treeselect__single-value {
+  color: #fff !important;
+}
 </style>

+ 20 - 17
src/views/materialManagement/propertyChange/index.vue

@@ -134,9 +134,9 @@
         />
       </el-form-item> -->
       <el-form-item>
-        <el-button type="primary" size="btn" @click="handleQuery"
+        <!-- <el-button type="primary" size="btn" @click="handleQuery"
           >搜索</el-button
-        >
+        > -->
         <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -294,7 +294,7 @@
       append-to-body
       :close-on-click-modal="false"
     >
-        <div class="jiben">基本信息</div>
+      <div class="jiben">基本信息</div>
 
       <el-form
         ref="form"
@@ -309,8 +309,11 @@
             placeholder="请输入变更后人员名称"
           />
         </el-form-item> -->
-        <el-form-item label="营具名称" prop="name">
-          <el-select v-model="form.name" placeholder="请输入营具名称" ></el-select>
+        <el-form-item label="物品名称" prop="name">
+          <el-select
+            v-model="form.name"
+            placeholder="请选择物品名称"
+          ></el-select>
         </el-form-item>
         <el-form-item label="营具编号" prop="rukuNumber">
           <el-input v-model="form.rukuNumber" placeholder="请输入营具编号" />
@@ -324,25 +327,25 @@
             placeholder="请输入变更前所属单位"
           ></el-select>
         </el-form-item>
-        <el-form-item label="变更后所属单位" prop="afterUnitId">
-          <el-select
-            v-model="form.afterUnitId"
-            placeholder="请输入变更后所属单位"
-          ></el-select>
-        </el-form-item>
         <el-form-item label="变更前人员名称" prop="beforePeopleId">
           <el-select
             v-model="form.beforePeopleId"
             placeholder="请输入变更前人员名称"
           ></el-select>
         </el-form-item>
+        <el-form-item label="变更后所属单位" prop="afterUnitId">
+          <el-select
+            v-model="form.afterUnitId"
+            placeholder="请输入变更后所属单位"
+          ></el-select>
+        </el-form-item>
         <el-form-item label="变更后人员名称" prop="afterPeopleId">
           <el-select
             v-model="form.afterPeopleId"
             placeholder="请输入变更后人员名称"
           ></el-select>
         </el-form-item>
-        
+
         <!-- <el-form-item label="变更前单位名称" prop="beforeUnitName">
           <el-input
             v-model="form.beforeUnitName"
@@ -612,19 +615,19 @@ export default {
 ::v-deep .el-form-item__content {
   width: 200px;
 }
-::v-deep .el-dialog__footer{
+::v-deep .el-dialog__footer {
   margin-right: 6px !important;
 }
 .contents {
   padding: 0px 40px !important;
 }
-::v-deep .el-form-item__label{
+::v-deep .el-form-item__label {
   width: 115px !important;
 }
-::v-deep .el-dialog__body{
-      padding: 30px 0px 30px 26px !important;
+::v-deep .el-dialog__body {
+  padding: 30px 0px 30px 26px !important;
 }
-::v-deep .el-form .el-input__inner{
+::v-deep .el-form .el-input__inner {
   height: 36px !important;
 }
 </style>