diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SelectController.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SelectController.java
index 36bbe837..5b237c54 100644
--- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SelectController.java
+++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SelectController.java
@@ -5,6 +5,7 @@ import com.bonus.sgzb.system.domain.SelectDto;
 import com.bonus.sgzb.system.service.SelectService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -23,91 +24,91 @@ public class SelectController {
 
     @ApiOperation(value = "往来单位下拉选")
     @PostMapping("getUnitCbx")
-    public AjaxResult getUnitData(SelectDto dto) {
+    public AjaxResult getUnitData(@RequestBody SelectDto dto) {
         return service.getUnitData(dto);
     }
 
     @ApiOperation(value = "工程下拉选")
     @PostMapping("getSectionEngineeringCbx")
-    public AjaxResult getProData(SelectDto dto) {
+    public AjaxResult getProData(@RequestBody SelectDto dto) {
         return service.getProData(dto);
     }
 
     @ApiOperation(value = "机具类型下拉选")
     @PostMapping("getMaTypeData")
-    public AjaxResult getMaTypeData(SelectDto dto){
+    public AjaxResult getMaTypeData(@RequestBody SelectDto dto){
         return service.getMaTypeData(dto);
     }
 
     @ApiOperation(value = "数据字典下拉选")
     @PostMapping("getDictByPidCbx")
-    public AjaxResult getDictByPidCbx(SelectDto dto){
+    public AjaxResult getDictByPidCbx(@RequestBody SelectDto dto){
         return service.getDictByPidCbx(dto);
     }
 
     @ApiOperation(value = "单位树/归属部门/所属上级")
     @PostMapping("getDeptTree")
-    public AjaxResult getDeptTree(SelectDto dto){
+    public AjaxResult getDeptTree(@RequestBody SelectDto dto){
         return service.getDeptTree(dto);
     }
 
     @ApiOperation(value = "岗位下拉选")
     @PostMapping("getPostCbx")
-    public AjaxResult getPostCbx(SelectDto dto){
+    public AjaxResult getPostCbx(@RequestBody SelectDto dto){
         return service.getPostCbx(dto);
     }
 
     @ApiOperation(value = "角色下拉选")
     @PostMapping("getRoleCbx")
-    public AjaxResult getRoleCbx(SelectDto dto){
+    public AjaxResult getRoleCbx(@RequestBody SelectDto dto){
         return service.getRoleCbx(dto);
     }
 
     @ApiOperation(value = "单位类型下拉选")
     @PostMapping("getUnitTypeCbx")
-    public AjaxResult getUnitTypeCbx(SelectDto dto){
+    public AjaxResult getUnitTypeCbx(@RequestBody SelectDto dto){
         return service.getUnitTypeCbx(dto);
     }
 
     @ApiOperation(value = "设备类型树")
     @PostMapping("getDeviceTypeTree")
-    public AjaxResult getDeviceTypeTree(SelectDto dto){
+    public AjaxResult getDeviceTypeTree(@RequestBody SelectDto dto){
         return service.getDeviceTypeTree(dto);
     }
 
     @ApiOperation(value = "资产属性")
     @PostMapping("getAssetAttributesCbx")
-    public AjaxResult getAssetAttributesCbx(SelectDto dto){
+    public AjaxResult getAssetAttributesCbx(@RequestBody SelectDto dto){
         return service.getAssetAttributesCbx(dto);
     }
 
     @ApiOperation(value = "机具厂家")
     @PostMapping("getDeviceFactoryCbx")
-    public AjaxResult getDeviceFactoryCbx(SelectDto dto){
+    public AjaxResult getDeviceFactoryCbx(@RequestBody SelectDto dto){
         return service.getDeviceFactoryCbx(dto);
     }
 
     @ApiOperation(value = "工程项目")
     @PostMapping("getProCbx")
-    public AjaxResult getProCbx(SelectDto dto){
+    public AjaxResult getProCbx(@RequestBody SelectDto dto){
         return service.getProCbx(dto);
     }
 
     @ApiOperation(value = "配件所属上级树")
     @PostMapping("getAccessoryTree")
-    public AjaxResult getAccessoryTree(SelectDto dto){
+    public AjaxResult getAccessoryTree(@RequestBody SelectDto dto){
         return service.getAccessoryTree(dto);
     }
 
     @ApiOperation(value = "货架")
     @PostMapping("getGoodsShelvesCbx")
-    public AjaxResult getGoodsShelvesCbx(SelectDto dto){
+    public AjaxResult getGoodsShelvesCbx(@RequestBody SelectDto dto){
         return service.getGoodsShelvesCbx(dto);
     }
 
     @ApiOperation(value = "用户/维修员/库管员/采购员")
     @PostMapping("getUserByRoleIdCbx")
-    public AjaxResult getUserByRoleIdCbx(SelectDto dto){
+    public AjaxResult getUserByRoleIdCbx(@RequestBody SelectDto dto){
         return service.getUserByRoleIdCbx(dto);
     }
 }
diff --git a/sgzb-ui/.env.production b/sgzb-ui/.env.production
index b4893b0d..512859c3 100644
--- a/sgzb-ui/.env.production
+++ b/sgzb-ui/.env.production
@@ -1,8 +1,8 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 施工装备管理系统
 
 # 生产环境配置
 ENV = 'production'
 
 # 若依管理系统/生产环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = '/dev-api'
diff --git a/sgzb-ui/src/api/system/upload.js b/sgzb-ui/src/api/system/upload.js
new file mode 100644
index 00000000..4560e702
--- /dev/null
+++ b/sgzb-ui/src/api/system/upload.js
@@ -0,0 +1,42 @@
+import request from '@/utils/request'
+//资源图片上传
+export function imgUpLoad(param){
+    const formData = new FormData()
+    formData.append('file', param.file)
+    formData.append('fileType', param.type)
+    return request({
+      url: '/system/sys/file/upload',
+      method: 'post',
+      data: formData,
+      header:'multipart/form-data'
+    })
+  }
+
+//资源文件上传
+export function fileUpLoad(param){
+    const formData = new FormData()
+    formData.append('file', param.file)
+    return request({
+      url: '/system/sys/file/upload',
+      method: 'post',
+      data: formData,
+    })
+  }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sgzb-ui/src/views/base/assetAttributeAllocation/index.vue b/sgzb-ui/src/views/base/assetAttributeAllocation/index.vue
index 8e22687b..c6dbf8f7 100644
--- a/sgzb-ui/src/views/base/assetAttributeAllocation/index.vue
+++ b/sgzb-ui/src/views/base/assetAttributeAllocation/index.vue
@@ -331,8 +331,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.typeId);
-      
+      this.ids = selection.map(item => item);
       console.log(this.ids)
     },
     /** 保存按钮操作 */
@@ -342,7 +341,8 @@ export default {
       if(this.chosenPropId && this.ids.length>0){
         let param = {
           propId:this.chosenPropId,
-          typeId:this.ids[0]
+          typeId:this.ids[0].typeId,
+          propName:this.ids[0].propName,
         }
         savePropInfo(param).then(response => {
           if(response.code == 200){
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue b/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue
index 0727c139..01bb76ce 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue
@@ -162,20 +162,20 @@
         </el-form-item>
         <el-form-item label="开始日期" prop="planStartTime">
           <el-date-picker
+              style="width:100%;"
               v-model="form.planStartTime"
-              style="width: 240px"
               value-format="yyyy-MM-dd"
               type="date"
               placeholder="开始日期"
           ></el-date-picker>
         </el-form-item>
-        <el-form-item label="租赁期限" prop="leaseDay">
-          <el-input-number v-model="form.leaseDay" style="width:100%;" placeholder="请输入租赁期限" controls-position="right" :min="0" />
+        <el-form-item label="租赁期限(天)" prop="leaseDay">
+          <el-input-number v-model="form.leaseDay" style="width:100%;" placeholder="请输入租赁期限(天)" controls-position="right" :min="0" />
         </el-form-item>
         <el-form-item label="签订日期" prop="signTime">
           <el-date-picker
               v-model="form.signTime"
-              style="width: 240px"
+              style="width:100%;"
               value-format="yyyy-MM-dd"
               type="date"
               placeholder="开始日期"
@@ -399,7 +399,7 @@ export default {
     handleDelete(row) {
       // const agreementId = row.agreementId;
       let param = {
-        agreementId:row.agreementId
+        agreementId:row.agreementId+''
       }
       this.$modal.confirm('是否确认删除该数据项？').then(function() {
         return removeAgreement(param);
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
index b30c8a56..e5542494 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
@@ -61,7 +61,7 @@
 
     <el-table v-loading="loading" :data="equipmentList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="dictId" />
+      <el-table-column label="序号" align="center" type="index" />
       <el-table-column label="机具类型名称" align="center" prop="machineTypeName" :show-overflow-tooltip="true" />
       <el-table-column label="规格型号" align="center" prop="specificationType" :show-overflow-tooltip="true" />
       <el-table-column label="管理模式" align="center" prop="manageType" :show-overflow-tooltip="true" >
@@ -71,6 +71,7 @@
         </template>
       </el-table-column>
       <el-table-column label="机具厂家" align="center" prop="supplier" :show-overflow-tooltip="true" />
+      <el-table-column label="采购数量" align="center" prop="purchaseNum" :show-overflow-tooltip="true" />
       <el-table-column label="验收数量" align="center" prop="checkNum" :show-overflow-tooltip="true" />
       <el-table-column label="是否已具备设备自编号" align="center" prop="dictName" :show-overflow-tooltip="true" />
       <el-table-column label="验收图片" align="center" prop="checkUrl" :show-overflow-tooltip="true" />
@@ -154,7 +155,7 @@
             <!-- <el-table-column type="selection" width="50" align="center" /> -->
             <el-table-column label="序号" align="center" key="userId" prop="userId" />
             <el-table-column label="人员名称" align="center" key="userName" prop="userName" :show-overflow-tooltip="true" />
-            <el-table-column label="所属机构" align="center" key="nickName" prop="nickName" :show-overflow-tooltip="true" />
+            <el-table-column label="所属机构" align="center" key="deptName" prop="deptName" :show-overflow-tooltip="true" />
             <el-table-column label="角色" align="center" key="deptName" prop="dept.deptName" :show-overflow-tooltip="true" />
             <el-table-column label="联系电话" align="center" key="phonenumber" prop="phonenumber" width="120" />
             <el-table-column
@@ -446,7 +447,9 @@ export default {
       // const dictId = row.dictId || this.ids
       // getType(dictId).then(response => {
         console.log(row)
-        this.form = row;
+        let rowData = row
+        rowData.checkNum = rowData.purchaseNum;
+        this.form = rowData;
         this.open = true;
         this.title = "验收";
       // });
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
index 1e20719b..86c8286c 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="24" class="mb8">
-      <el-col :span="4" style="text-align:center;"><h4>新购任务信息:</h4></el-col>
+      <!-- <el-col :span="4" style="text-align:center;"><h4>新购任务信息:</h4></el-col> -->
       <el-col :span="16">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" >
           <el-form-item label="机具类型" prop="equipmentId">
@@ -33,32 +33,10 @@
               />
             </el-select>
           </el-form-item> 
-    </el-form>
-
+        </el-form>  
       </el-col>
     </el-row>
-    
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-            type="primary"
-            plain
-            icon="el-icon-plus"
-            size="mini"
-            @click="handleAdd"
-            v-hasPermi="['system:role:add']"
-        >保存</el-button>
-      </el-col>
-      <el-col :span="3">
-        <el-button
-            type="success"
-            plain
-            icon="el-icon-edit"
-            size="mini"
-            @click="jumpList"
-        >采购验收管理</el-button>
-      </el-col>
-      <el-form :model="dataForm" ref="dataForm" :rules="rules" size="small" :inline="true">
+    <el-form :model="dataForm" ref="dataForm" :rules="rules" size="small" :inline="true">
       <el-row>
         <el-form-item label="采购日期" prop="purchaseTime">
           <el-date-picker
@@ -87,7 +65,7 @@
             <el-option
               v-for="item in userList"
               :key="item.userId"
-              :label="item.nickName"
+              :label="item.userName"
               :value="item.userId"
               v-if="item.status !='1'"
             ></el-option>
@@ -103,7 +81,29 @@
           />
         </el-form-item>
       </el-row>
-    </el-form>
+      </el-form>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+        >保存</el-button>
+      </el-col>
+      <el-col :span="3">
+        <el-button
+            type="success"
+            plain
+            icon="el-icon-edit"
+            size="mini"
+            @click="jumpList"
+        >采购验收管理</el-button>
+      </el-col>
+
+
+      
       
       <!-- <el-col :span="1.5">
         <el-button
@@ -205,6 +205,7 @@ export default {
   components: { Treeselect },
   data() {
     return {
+      taskId:'',
       // 遮罩层
       loading: false,
       // 选中数组
@@ -290,13 +291,15 @@ export default {
         arrivalTime: [
           { required: true, message: "到货日期不能为空", trigger: "blur" }
         ],
-        purchaser: [
-          { required: true, message: "采购员不能为空", trigger: "blur" }
-        ]
+        // purchaser: [
+        //   { required: true, message: "采购员不能为空", trigger: "blur" }
+        // ]
       }
     };
   },
   created() {
+    const taskId = this.$route.query && this.$route.query.taskId;
+    this.taskId = taskId;
     this.getUserList()
     // this.getList();
     this.equipmentType();
@@ -305,7 +308,7 @@ export default {
   methods: {
      /** 查询用户列表--采购员 */
      getUserList() {
-      getUserByRoleList().then(response => {
+      getUserByRoleList({roleId:'104'}).then(response => {
         this.userList = response.data;
         }
       );
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
index ecb27087..97651bd3 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
@@ -28,16 +28,15 @@
             v-hasPermi="['store:labelType:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
             type="primary"
             plain
             icon="el-icon-plus"
             size="mini"
-            @click="handleAdd"
-            v-hasPermi="['store:labelType:add']"
+        
         >发布入库</el-button>
-      </el-col>
+      </el-col> -->
       <!--      <el-col :span="1.5">-->
       <!--        <el-button-->
       <!--          type="success"-->
@@ -261,6 +260,11 @@ export default {
       // this.reset();
       // this.open = true;
       // this.title = "添加字典类型";
+    },
+     /** 修改按钮操作 */
+     handleUpdate(row) {
+      let query = { taskId:row.taskId }
+      this.$router.replace({ path: "/store/newBuy/newDevicesArrival", query });
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -268,17 +272,17 @@ export default {
       this.single = selection.length!=1
       this.multiple = !selection.length
     },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.$router.replace("/store/newBuy/newDevicesArrival");
-      // this.reset();
-      // const dictId = row.dictId || this.ids
-      // getType(dictId).then(response => {
-      //   this.form = response.data;
-      //   this.open = true;
-      //   this.title = "修改字典类型";
-      // });
-    },
+    // /** 修改按钮操作 */
+    // handleUpdate(row) {
+    //   this.$router.replace("/store/newBuy/newDevicesArrival");
+    //   // this.reset();
+    //   // const dictId = row.dictId || this.ids
+    //   // getType(dictId).then(response => {
+    //   //   this.form = response.data;
+    //   //   this.open = true;
+    //   //   this.title = "修改字典类型";
+    //   // });
+    // },
     /** 提交按钮 */
     submitForm: function() {
       this.$refs["form"].validate(valid => {
diff --git a/sgzb-ui/src/views/store/shelves/shelvesList.vue b/sgzb-ui/src/views/store/shelves/shelvesList.vue
index 35279b11..a352a66c 100644
--- a/sgzb-ui/src/views/store/shelves/shelvesList.vue
+++ b/sgzb-ui/src/views/store/shelves/shelvesList.vue
@@ -66,7 +66,7 @@
             v-hasPermi="['system:dept:edit']"
           >编辑</el-button>
           <el-button
-            v-if="scope.row.deptId != 0"
+            v-if="scope.row.parentId != 0"
             size="mini"
             type="text"
             icon="el-icon-delete"
@@ -90,8 +90,8 @@
 
         <el-row>
           <el-col :span="24">
-            <el-form-item label="上级组织" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
+            <el-form-item label="上级组织" prop="parentId">
+              <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -148,7 +148,7 @@ export default {
   data() {
     return {
       // 遮罩层
-      loading: true,
+      loading: false,
       // 显示搜索条件
       showSearch: true,
       // 表格树数据
@@ -172,7 +172,7 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        deptId: [
+        parentId: [
           { required: true, message: "上级部门不能为空", trigger: "blur" }
         ],
         houseName: [
@@ -181,13 +181,14 @@ export default {
         sort: [
           { required: true, message: "显示排序不能为空", trigger: "blur" }
         ],
-        phone: [
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
-            trigger: "blur"
-          }
-        ]
+        // phone: [
+        //   { required: true, message: "手机号码不能为空", trigger: "blur" },
+        //   // {
+        //   //   pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+        //   //   message: "请输入正确的手机号码",
+        //   //   trigger: "blur"
+        //   // }
+        // ]
       }
     };
   },
@@ -200,7 +201,7 @@ export default {
       this.loading = true;
       listHouse(this.queryParams).then(response => {
         console.log(response)
-        this.houseList = this.handleTree(response.rows, "houseId");
+        this.houseList = this.handleTree(response.data, "houseId");
         this.loading = false;
       });
     },
@@ -224,7 +225,7 @@ export default {
     reset() {
       this.form = {
         houseId: undefined,
-        deptId: undefined,
+        parentId: undefined,
         houseName: undefined,
         sort: undefined,
         concat: undefined,
@@ -247,12 +248,12 @@ export default {
     handleAdd(row) {
       this.reset();
       if (row != undefined) {
-        this.form.deptId = row.houseId;
+        this.form.parentId = row.houseId;
       }
       this.open = true;
       this.title = "新建";
       listHouse().then(response => {
-        this.deptOptions = this.handleTree(response.rows, "houseId");
+        this.deptOptions = this.handleTree(response.data, "houseId");
       });
     },
     /** 展开/折叠操作 */
diff --git a/sgzb-ui/src/views/store/tools/devices.vue b/sgzb-ui/src/views/store/tools/devices.vue
index 7d6124f7..8002a483 100644
--- a/sgzb-ui/src/views/store/tools/devices.vue
+++ b/sgzb-ui/src/views/store/tools/devices.vue
@@ -274,6 +274,9 @@
 <script>
 import {addMachine, delMachine, getMachine, listMachine, updateMachine} from "@/api/store/tools";
 import { getProLists } from "@/api/base/base";
+import { imgUpLoad } from "@/api/system/upload";
+
+
 export default {
   name: "Dict",
   dicts: ['sys_normal_disable'],
diff --git a/sgzb-ui/src/views/store/tools/keeper.vue b/sgzb-ui/src/views/store/tools/keeper.vue
index 32de5472..e8b6d220 100644
--- a/sgzb-ui/src/views/store/tools/keeper.vue
+++ b/sgzb-ui/src/views/store/tools/keeper.vue
@@ -26,10 +26,10 @@
               @node-click="handleNodeClick"
           />
         </div>
-        <div style="margin:30px;">
+        <!-- <div style="margin:30px;">
           <el-button >取 消</el-button>
           <el-button type="primary">确 定</el-button>
-        </div>
+        </div> -->
 
 
       </el-col>
diff --git a/sgzb-ui/src/views/store/tools/repair.vue b/sgzb-ui/src/views/store/tools/repair.vue
index 124f6785..d38e8344 100644
--- a/sgzb-ui/src/views/store/tools/repair.vue
+++ b/sgzb-ui/src/views/store/tools/repair.vue
@@ -26,10 +26,10 @@
               @node-click="handleNodeClick"
           />
         </div>
-        <div style="margin:30px;">
+        <!-- <div style="margin:30px;">
           <el-button >取 消</el-button>
           <el-button type="primary">确 定</el-button>
-        </div>
+        </div> -->
 
 
       </el-col>
diff --git a/sgzb-ui/src/views/store/tools/toolsSupplier.vue b/sgzb-ui/src/views/store/tools/toolsSupplier.vue
index 7507ef34..3971d0ca 100644
--- a/sgzb-ui/src/views/store/tools/toolsSupplier.vue
+++ b/sgzb-ui/src/views/store/tools/toolsSupplier.vue
@@ -82,7 +82,11 @@
       <el-table-column label="主要联系人" align="center" prop="primaryContact" :show-overflow-tooltip="true" />
       <el-table-column label="联系电话" align="center" prop="phone" :show-overflow-tooltip="true" />
       <el-table-column label="主要经营范围" align="center" prop="businessScope" :show-overflow-tooltip="true" />
-      <el-table-column label="营业执照" align="center" prop="businessLicense" :show-overflow-tooltip="true" />
+      <el-table-column label="营业执照" align="center" prop="businessLicense" :show-overflow-tooltip="true" >
+        <template slot-scope="scope">
+          <span @click="openImg(scope.row.businessLicense)" style="color: #02A7F0;"> 查看 </span>
+        </template>
+      </el-table-column>
 
       <el-table-column label="状态" align="center" prop="status" width="180">
         <template slot-scope="scope">
@@ -142,6 +146,19 @@
           <el-input v-model="form.businessScope" placeholder="请输入经营范围" />
         </el-form-item>
         <el-form-item label="营业执照" prop="businessLicense">
+          <el-upload 
+                :http-request="(obj) => imgUpLoad(obj,'fileUrl')"
+                action="#" 
+                :file-list="fileList"
+                :show-file-list="false"
+                list-type="picture-card"
+                :on-success="handleAvatarSuccess"
+                :on-preview="handlePictureCardPreview"
+                :on-remove="handleRemove">
+                <img v-if="imageUrl" :src="'http://192.168.0.14:21624/system'+imageUrl" style="width: 140px;height: 140px;" class="avatar">
+                <!-- <img v-if="imageUrl" :src="'http://10.40.92.140:9201'+imageUrl" style="width: 140px;height: 140px;" class="avatar"> -->
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+              </el-upload>
           <!-- <el-input v-model="form.businessLicense" placeholder="请上传营业执照" /> -->
         </el-form-item>
 
@@ -151,12 +168,17 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog :visible.sync="dialogVisible">
+      <img width="100%" :src="dialogImageUrl" alt="">
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
 import { listSupplierInfo, getSupplierInfo, addSupplier, updateSupplier, delSupplier } from "@/api/store/tools";
-
+import { imgUpLoad,fileUpLoad } from "@/api/system/upload";
 export default {
   name: "Dict",
   dicts: ['sys_normal_disable'],
@@ -190,6 +212,12 @@ export default {
       },
       // 表单参数
       form: {},
+      dialogImageUrl: '',
+      dialogVisible: false,
+      imageUrl:'',
+      imageName:'',
+      fileList:[],
+      field101fileList:[],
       // 表单校验
       rules: {
         dictName: [
@@ -288,6 +316,48 @@ export default {
         }
       });
     },
+    // 图片上传
+    imgUpLoad(param,name,index) {
+      console.log(param,'image')
+      param.type = 'ma'
+      imgUpLoad(param).then(res => {
+        if(res.code == 200) {
+          this.form.businessLicense = res.data.fileUrl;
+          // this.form.photoName = res.data.fileName;
+          this.imageUrl = res.data.fileUrl;
+          // this.imageName = res.data.fileName;
+        }else{
+          // this.$msgError(res.msg)
+          this.$modal.msgError(res.msg);
+        }
+      }).catch((error) => {
+        // this.$msgError(error)
+        this.$modal.msgError(error);
+      })
+    },
+    handleAvatarSuccess(res,file) {
+      console.log("success")
+       
+        // this.imageUrl = URL.createObjectURL(file.raw);
+        // console.log(this.imageUrl)
+      },
+    handleRemove(file, fileList) {
+      console.log(file, fileList);
+      console.log(this.form,'222222')
+      this.form.businessLicense = "";
+    },
+    //图片点击查看
+    handlePictureCardPreview(file) {
+      console.log(file)
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+     //图片查看
+     openImg(url){
+      this.dialogImageUrl = "http://192.168.0.14:21624/system" + url;//线上
+      // this.dialogImageUrl = "http://10.40.92.140:9201" + url;//本地
+      this.dialogVisible = true;
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const supplierIds = row.supplierId || this.ids;
diff --git a/sgzb-ui/src/views/store/tools/toolsType.vue b/sgzb-ui/src/views/store/tools/toolsType.vue
index 0ba210e6..e73938c9 100644
--- a/sgzb-ui/src/views/store/tools/toolsType.vue
+++ b/sgzb-ui/src/views/store/tools/toolsType.vue
@@ -98,11 +98,29 @@
           <el-table-column label="库管员" align="center" key="keeperUserName" prop="keeperUserName"
                            :show-overflow-tooltip="true"/>
           <el-table-column label="管理模式" align="center" key="manageType" prop="manageType"
-                           :show-overflow-tooltip="true"/>
+                           :show-overflow-tooltip="true">
+                           <template slot-scope="scope">
+                            <span v-if="scope.row.manageType=='0'">编码管理</span>
+                            <span v-if="scope.row.manageType=='1'">数量管理</span>
+                           </template>
+                          </el-table-column> 
+
+
+
+
           <el-table-column label="图片" align="center" key="photoName" prop="photoName"
-                           :show-overflow-tooltip="true"/>
+                           :show-overflow-tooltip="true">
+                            <template slot-scope="scope">
+                              <span @click="openImg(scope.row.photoUrl)" style="color: #02A7F0;"> {{ scope.row.photoName }} </span>
+                            </template>
+                          </el-table-column>
           <el-table-column label="文档资料" align="center" key="documentName" prop="documentName"
-                           :show-overflow-tooltip="true"/>
+                           :show-overflow-tooltip="true">
+                            <template slot-scope="scope">
+                              <a :href="'http://192.168.0.14:21624/system'+scope.row.documentUrl" style="color: #02A7F0;" :download="scope.row.documentName">{{ scope.row.documentName }}</a>
+                              <!-- <a :href="'http://10.40.92.140:9201'+scope.row.documentUrl" style="color: #02A7F0;" :download="scope.row.documentName">{{ scope.row.documentName }}</a> -->
+                            </template>
+                          </el-table-column>
           <el-table-column label="资产属性" align="center" key="propName" prop="propName"
                            :show-overflow-tooltip="true"/>
           <el-table-column label="备注信息" align="center" key="remark" prop="remark"
@@ -243,21 +261,31 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="文档资料" prop="field101">
-              <!-- <el-upload ref="field101" :file-list="field101fileList" action=""
-                         :before-upload="field101BeforeUpload">
+              <el-upload ref="field101" 
+                :file-list="field101fileList"
+                action="#"  :limit='1'
+                :http-request="(obj) => fileUpLoad(obj,'fileUrl')"
+                :on-exceed="exceedFile"
+                
+                >
                 <el-button size="small" type="primary" icon="el-icon-upload">点击上传</el-button>
-              </el-upload> -->
+              </el-upload>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="图片" prop="photoName">
-              
-              <el-upload
-                action="https://jsonplaceholder.typicode.com/posts/"
+              <el-upload 
+                :http-request="(obj) => imgUpLoad(obj,'fileUrl')"
+                action="#" 
+                :file-list="fileList"
+                :show-file-list="false"
                 list-type="picture-card"
+                :on-success="handleAvatarSuccess"
                 :on-preview="handlePictureCardPreview"
                 :on-remove="handleRemove">
-                <i class="el-icon-plus"></i>
+                <img v-if="imageUrl" :src="'http://192.168.0.14:21624/system'+imageUrl" style="width: 140px;height: 140px;" class="avatar">
+                <!-- <img v-if="imageUrl" :src="'http://10.40.92.140:9201'+imageUrl" style="width: 140px;height: 140px;" class="avatar"> -->
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
             </el-form-item>
           </el-col>
@@ -318,19 +346,18 @@
 
     <!--    配置弹窗  -->
     <el-dialog :title="title" :visible.sync="configOpen" width="650px" append-to-body>
-      <el-form ref="form" :model="cform" :rules="crules" label-width="100px">
+      <el-form ref="cform" :model="cform" :rules="crules" label-width="100px">
         <el-row>
           <el-col :span="24">
             <el-form-item label="调整前价格">
-              <el-input v-model="cform.price"  placeholder="调整前价格"></el-input>
+              <el-input v-model="leasePrice"  placeholder="调整前价格" disabled></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="调整后价格">
-<!--              <el-input v-model="cform.afterPrice" type="textarea" placeholder="请输入内容"></el-input>-->
-              <el-input-number v-model="cform.afterPrice" style="width: 100%;" controls-position="right" :min="1" :max="1000"></el-input-number>
+              <el-input-number v-model="cform.leasePrice" style="width: 100%;" controls-position="right" :min="1" :max="1000"></el-input-number>
             </el-form-item>
           </el-col>
         </el-row>
@@ -338,13 +365,11 @@
           <el-col :span="24">
             <el-form-item label="开始使用日期">
               <el-date-picker
-                v-model="cform.useDate"
+                v-model="cform.effTime"
                 style="width: 240px"
-                value-format="yyyy-MM-dd"
-                type="daterange"
-                range-separator="-"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                type="datetime"
+                placeholder="开始使用日期"
               ></el-date-picker>
             </el-form-item>
           </el-col>
@@ -377,6 +402,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {getListByMaType, getMaTypeList,getMaType, addMaType, updateMaType, delMaType} from "@/api/store/tools";
 import { getUserByRoleList } from "@/api/system/user";
 import { getProLists } from "@/api/base/base";
+import { imgUpLoad,fileUpLoad } from "@/api/system/upload";
 
 export default {
   name: "User",
@@ -422,6 +448,13 @@ export default {
       roleOptions: [],
       // 表单参数
       form: {},
+      chosenTypeId:'',
+      leasePrice:'',
+      uploadHeader: process.env.VUE_APP_BASE_API,
+      imageUrl:'',
+      imageName:'',
+      fileList:[],
+      field101fileList:[],
       defaultProps: {
         children: "children",
         label: "label"
@@ -477,7 +510,7 @@ export default {
             message: "请输入正确的手机号码",
             trigger: "blur"
           }
-        ]
+        ] 
       },
       dialogImageUrl: '',
       dialogVisible: false,
@@ -487,13 +520,13 @@ export default {
         afterPrice: "",
         useDate: "",
       },
-      crules: {
-        afterPrice: [
-          {required: true, message: "用户名称不能为空", trigger: "blur"},
+      crules: { 
+        leasePrice: [
+          {required: true, message: "调整后价格不能为空", trigger: "blur"},
           // { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
         ],
-        useDate: [
-          {required: true, message: "用户昵称不能为空", trigger: "blur"}
+        effTime: [
+          {required: true, message: "开始日期不能为空", trigger: "blur"}
         ],
       }
     };
@@ -535,14 +568,6 @@ export default {
         this.propList = response.rows; 
       });
     },
-    //图片上传
-    handleRemove(file, fileList) {
-      console.log(file, fileList);
-    },
-    handlePictureCardPreview(file) {
-      this.dialogImageUrl = file.url;
-      this.dialogVisible = true;
-    },
     /** 查询列表 */
     getList() {
       this.loading = true;
@@ -571,8 +596,13 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-         
+        photoUrl:"",
+        photoName:"",
+        documentUrl:"",
+        documentName:""
       };
+      this.fileList = []
+      this.field101fileList = []
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -620,12 +650,15 @@ export default {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
+              this.getTreeData();
+              
             });
           } else {
             addMaType(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
+              this.getTreeData();
             });
           }
         }
@@ -644,15 +677,103 @@ export default {
     },
     //配置操作
     handleConfig(row) {
+      this.resetForm("cform");
+      this.chosenTypeId = row.typeId;
+      this.leasePrice = row.leasePrice;
+      this.cform.leasePrice = row.leasePrice;
       this.configOpen = true;
       this.title = "租赁价格调整"
     },
     submitConfig(){
-      this.configOpen = false;
+      let param = {
+        typeId:this.chosenTypeId,
+        effTime:this.cform.effTime,
+        leasePrice:this.cform.leasePrice,
+      }
+      console.log(param)
+      this.$refs["cform"].validate(valid => {
+        if (valid) {
+          updateMaType(param).then(response => {
+              this.$modal.msgSuccess("调整成功");
+              this.configOpen = false;
+              this.getList();
+              this.getTreeData();
+            });
+        }
+      });
+      // this.configOpen = false;
     },
     cancelConfig(){
       this.configOpen = false;
     },
+    // 图片上传
+    imgUpLoad(param,name,index) {
+      console.log(param,'image')
+      param.type = 'ma'
+      imgUpLoad(param).then(res => {
+        if(res.code == 200) {
+          this.form.photoUrl = res.data.fileUrl;
+          this.form.photoName = res.data.fileName;
+          this.imageUrl = res.data.fileUrl;
+          this.imageName = res.data.fileName;
+        }else{
+          // this.$msgError(res.msg)
+          this.$modal.msgError(res.msg);
+        }
+      }).catch((error) => {
+        // this.$msgError(error)
+        this.$modal.msgError(error);
+      })
+    },
+    handleAvatarSuccess(res,file) {
+      console.log("success")
+       
+        // this.imageUrl = URL.createObjectURL(file.raw);
+        // console.log(this.imageUrl)
+      },
+    handleRemove(file, fileList) {
+      console.log(file, fileList);
+      console.log(this.form,'222222')
+      this.form.photoUrl = "";
+      this.form.photoName = "";
+    },
+    //图片点击查看
+    handlePictureCardPreview(file) {
+      console.log(file)
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+    //图片查看
+    openImg(url){
+      this.dialogImageUrl = "http://192.168.0.14:21624/system" + url;//线上
+      // this.dialogImageUrl = "http://10.40.92.140:9201" + url;//本地
+      this.dialogVisible = true;
+    },
+    //文件上传
+    fileUpLoad(param,name,index) {
+      // // console.log(param)
+      param.type = 'ma'
+      imgUpLoad(param).then(res => {
+        if(res.code == 200) {
+          this.form.documentUrl = res.data.fileUrl;
+          this.form.documentName = res.data.fileName;
+          this.field101fileList[0] = param.file
+          console.log(this.form)
+        }else{
+          // this.$msgError(res.msg)
+          this.$modal.msgError(res.msg);
+        }
+      }).catch((error) => {
+        // this.$msgError(error)
+        this.$modal.msgError(error);
+      })
+    },
+    exceedFile(files, fileList) {
+      this.$message.warning(
+        `只能选择 1 个文件导入，共选择了 ${files.length + fileList.length} 个文件`
+      );
+    },
+
     /** 导出按钮操作 */
     handleExport() {
       this.download('system/user/export', {
diff --git a/sgzb-ui/src/views/system/post/index.vue b/sgzb-ui/src/views/system/post/index.vue
index fd72ab25..8e47c6cd 100644
--- a/sgzb-ui/src/views/system/post/index.vue
+++ b/sgzb-ui/src/views/system/post/index.vue
@@ -84,7 +84,7 @@
       <el-table-column label="岗位编号" align="center" prop="postId" />
       <el-table-column label="岗位编码" align="center" prop="postCode" />
       <el-table-column label="岗位名称" align="center" prop="postName" />
-      <el-table-column label="岗位排序" align="center" prop="postSort" />
+      <!-- <el-table-column label="岗位排序" align="center" prop="postSort" /> -->
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
@@ -132,9 +132,9 @@
         <el-form-item label="岗位编码" prop="postCode">
           <el-input v-model="form.postCode" placeholder="请输入编码名称" />
         </el-form-item>
-        <el-form-item label="岗位顺序" prop="postSort">
+        <!-- <el-form-item label="岗位顺序" prop="postSort">
           <el-input-number v-model="form.postSort" controls-position="right" :min="0" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="岗位状态" prop="status">
           <el-radio-group v-model="form.status">
             <el-radio