diff --git a/src/utils/costTime.js b/src/utils/costTime.js
new file mode 100644
index 0000000..6cde676
--- /dev/null
+++ b/src/utils/costTime.js
@@ -0,0 +1,39 @@
+
+//格式时间
+export function FilterTime(time,type) {
+  var date = new Date(time);
+  var y = date.getFullYear();
+  var m = date.getMonth() + 1;
+  m = m < 10 ? "0" + m : m;
+  if(!!type){
+    return y + "-" + m;
+  }
+  var d = date.getDate();
+  d = d < 10 ? "0" + d : d;
+  var h = date.getHours();
+  h = h < 10 ? "0" + h : h;
+  var minute = date.getMinutes();
+  minute = minute < 10 ? "0" + minute : minute;
+  var s = date.getSeconds();
+  s = s < 10 ? "0" + s : s;
+  return y + "-" + m + "-" + d + " " + h + ":" + minute + ":" + s;
+};
+
+/**
+ * 根据当前月份获取其前12个月的月份
+ * @param month
+ * @return {Array|*}
+ */
+export function GetRecentMonth(month,arr) {
+  for(let i = 11;i > 0;i --) {
+    let sixMonth = month - i
+    if(sixMonth <= 0) {
+      sixMonth = 12 + sixMonth
+    }
+    arr.push(sixMonth + '月')
+  }
+  arr.push(month + '月')
+  return arr;
+};
+
+export default {GetRecentMonth,FilterTime };
\ No newline at end of file
diff --git a/src/views/activiti/form/ProcessMaterialsAllotForm.vue b/src/views/activiti/form/ProcessMaterialsAllotForm.vue
index 610d767..74fc8ec 100644
--- a/src/views/activiti/form/ProcessMaterialsAllotForm.vue
+++ b/src/views/activiti/form/ProcessMaterialsAllotForm.vue
@@ -49,8 +49,11 @@
           </a-col>
           <a-col :span="8">
             <a-form-item label="被调拨部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-select-depart v-decorator="['beAllotDepartment',validatorRules.beAllotDepartment]"
-                               @change='Department'  />
+<!--              <j-select-depart v-decorator="['beAllotDepartment',validatorRules.beAllotDepartment]"-->
+<!--                               @change='Department'  />-->
+              <a-select v-decorator="['beAllotDepartment',validatorRules.beAllotDepartment]" placeholder="请选择被调拨部门"    @change='Department' >
+                <a-select-option v-for="(item,index) in queryParamsUntil" :key="index" :value="item.id">{{item.departName}}</a-select-option>
+              </a-select>
             </a-form-item>
           </a-col>
           <a-col :span="8
@@ -343,6 +346,7 @@
           unitWasteNameUrl: '/unitwaste/processUnitWasteWarehouseCode/unitWasteName',
           puwwlistByuntil: '/unitwaste/processUnitWasteWarehouseCode/list',
           getFirstNode: '/actProcessIns/getFirstNode',
+          listByuntil: '/unitwaste/processUnitWasteWarehouseCode/listAll',
           processMaterialsAllotList: {
             list: '/hy/processMaterialsAllot/queryProcessMaterialsAllotListByMainId'
           }
@@ -359,6 +363,7 @@
           processPlan: { rules: [{ required: true, message: '请选择流程计划!' }] }
         },
         bigIdMerchandiseNewsList: [],
+        queryParamsUntil: [],
         materialGroupId: undefined,
         materialTypeRecord: undefined,
         qeihuan: undefined
@@ -432,8 +437,8 @@
     },
     created() {
       //如果是流程中表单，则需要加载流程表单data
-      this.showFlowData()
-
+      this.showFlowData();
+      this.getUnit();
       let company = sessionStorage.getItem('PARENT_ID')
       let userInfo = sessionStorage.getItem('USER_INFORMATION')
       // console.log("userInfouserInfo",JSON.parse(userInfo));
@@ -446,12 +451,15 @@
       }
     },
     methods: {
-      // click(record, index){
-      //   console.log("欧克")
-      // },
+      //加載項目部
+      getUnit(){
+        getAction(this.url.listByuntil).then((res) => {
+          if (res.success) {
+            this.queryParamsUntil =  res.result.records||res.result;
+          }
+        })
+      },
       async onSelect(record) {
-        // console.log(record)
-        // console.log("keykey",record.column.key)
         let isDB = true
         // if (!!record.row.materialGroup) {
         //     if (this.issh){
@@ -716,8 +724,8 @@
       },
 
       materialType(val) {
-        console.log("val===================")
-        console.log(val)
+        // console.log("val===================")
+        // console.log(val)
         this.materialTypeRecord = val;
         this.qeihuan = val;
         if (!!val  &&  !!this.libraryInvisible ) {
@@ -1096,9 +1104,12 @@
           this.libraryInvisible = value;
           getAction(this.url.puwwlistByuntil, params).then((rest) => {
             if (rest.success && rest.result.total > 0) {
-              this.libraryAssociationIdInvisible = value
-              this.heid = false
-              this.descriptionFetchData(this.materialTypeRecord,value);
+              this.libraryAssociationIdInvisible = value;
+              this.qeihuan = value;
+              if(!!this.materialTypeRecord){
+                this.heid = false;
+                this.descriptionFetchData(this.materialTypeRecord,value);
+              }
             }else {
               this.$message.error("请选择正确项目部！")
               this.heid = true;
diff --git a/src/views/dashboard/HomePage.vue b/src/views/dashboard/HomePage.vue
index 9bc85ec..9808e17 100644
--- a/src/views/dashboard/HomePage.vue
+++ b/src/views/dashboard/HomePage.vue
@@ -50,7 +50,7 @@
             <div slot="nextArrow" slot-scope="props" class="custom-slick-arrow" style="right: 10px">
               <a-icon type="right-circle" />
             </div>
-            <div v-for="item in this.listMien" style="height: 260px" >
+            <div v-for="item in this.listMien" style="height: 300px" >
               <img class="rightulliimg" :src="item.url" />
             </div>
           </a-carousel>
@@ -615,7 +615,7 @@ export default {
   display: block;
   margin: 5px auto;
   height: 90%;
-  width: 85%;
+  width: 100%;
   /* 水平垂直居中 */
 }
 
@@ -624,7 +624,7 @@ export default {
   text-align: center;
   height: 260px;
   line-height: 160px;
-  background: #364d79;
+  /*background: #888a8d;*/
   overflow: hidden;
 }
 
@@ -632,7 +632,7 @@ export default {
   width: 25px;
   height: 25px;
   font-size: 25px;
-  color: #fff;
+  color: #f6f3f3;
   background-color: rgba(31, 45, 61, 0.11);
   opacity: 0.3;
 }
diff --git a/src/views/dictionaries/ProcessDictionariesList.vue b/src/views/dictionaries/ProcessDictionariesList.vue
index efd0068..27794fd 100644
--- a/src/views/dictionaries/ProcessDictionariesList.vue
+++ b/src/views/dictionaries/ProcessDictionariesList.vue
@@ -83,16 +83,20 @@
           <a @click="handleEdit(record)">编辑</a>
 
           <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+
+           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
+           </a-popconfirm>
+<!--          <a-dropdown>-->
+<!--            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>-->
+<!--            <a-menu slot="overlay">-->
+<!--              <a-menu-item>-->
+<!--                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
+<!--                  <a>删除</a>-->
+<!--                </a-popconfirm>-->
+<!--              </a-menu-item>-->
+<!--            </a-menu>-->
+<!--          </a-dropdown>-->
         </span>
 
       </a-table>
@@ -100,7 +104,7 @@
 
     <a-tabs :activeKey="this.tabKey" >
       <a-tab-pane tab="物资库信息" key="1" >
-        <ProcessLibraryAssociationList :mainId="selectedMainId" />
+        <ProcessLibraryAssociationList :mainId="selectedMainId" :type="typeId" />
       </a-tab-pane>
       <a-tab-pane tab="供应商信息" key="2" forceRender>
         <ProcessSupplierList :mainId="selectedMainId" />
@@ -192,7 +196,8 @@
           showSizeChanger: true,
           total: 0
         },
-        selectedMainId:'',
+        selectedMainId:undefined,
+        typeId:undefined,
         superFieldList:[],
       }
     },
@@ -227,8 +232,14 @@
         this.selectedMainId=''
       },
       onSelectChange(selectedRowKeys, selectionRows) {
+        console.log(selectedRowKeys,selectionRows,"=-=-=-=-=");
         // this.tabKey= '3';
         if(selectionRows[0].typeName === '库房编码'){
+          if(selectionRows[0].dictionaryLabel == "FJWZ_BM"){
+            this.typeId = "1";
+          }else{
+            this.typeId = "2";
+          }
           this.tabKey= '1';
         }
         if(selectionRows[0].typeName === '物资信息'){
diff --git a/src/views/dictionaries/ProcessLibraryAssociationList.vue b/src/views/dictionaries/ProcessLibraryAssociationList.vue
index 4e3846f..d702f77 100644
--- a/src/views/dictionaries/ProcessLibraryAssociationList.vue
+++ b/src/views/dictionaries/ProcessLibraryAssociationList.vue
@@ -115,6 +115,11 @@
         type:String,
         default:'',
         required:false
+      },
+      type:{
+        type: String,
+        default:'',
+        required:false
       }
     },
     watch:{
@@ -124,7 +129,9 @@
           if(!this.mainId){
             this.clearList()
           }else{
-            this.queryParam['processDictionariesId'] = val
+            // this.queryParam['processDictionariesId'] = val;
+            this.queryParam['sort'] = parseInt(this.type);
+            this.dataSource = [];
             this.loadData(1);
           }
         }
@@ -164,7 +171,7 @@
             customRender:function (t,r,index) {
                console.log(t,r,index);
               let name = '';
-              if(r.sort === 0){
+              if(r.sort === 2){
                 name = "账外物资库房";
               }else if(r.sort === 1){
                 name = "废旧物资库房";
@@ -230,5 +237,5 @@
   }
 </script>
 <style scoped>
-  @import '~@assets/less/common.less'
+  @import '~@assets/less/common.less';
 </style>
diff --git a/src/views/dictionaries/modules/ProcessLibraryAssociationModal.vue b/src/views/dictionaries/modules/ProcessLibraryAssociationModal.vue
index 02f9201..0b923e0 100644
--- a/src/views/dictionaries/modules/ProcessLibraryAssociationModal.vue
+++ b/src/views/dictionaries/modules/ProcessLibraryAssociationModal.vue
@@ -25,8 +25,8 @@
             <a-form-item label="库房分类" :labelCol="labelCol" :wrapperCol="wrapperCol">
 <!--              <a-input v-decorator="['processDictionariesId']" placeholder="请输入分类" style="width: 100%" />-->
               <a-select v-decorator="['sort',validatorRules.sort]" placeholder="请选择库房分类" style="width: 100%"   >
-                <a-select-option value= 0 >账外物资库房编码</a-select-option>
-                <a-select-option value= 1 >废旧物资库房编码</a-select-option>
+                <a-select-option value= 2 >账外物资库房</a-select-option>
+                <a-select-option value= 1 >废旧物资库房</a-select-option>
               </a-select>
 
             </a-form-item>
@@ -115,9 +115,15 @@ import { getAction, httpAction } from '@/api/manage'
       edit (record) {
         this.form.resetFields();
         this.model = Object.assign({}, record);
+        // console.log("this,",this.model);
+        if(this.model.sort === 1){
+          this.model.sort = "废旧物资库房"
+        }else{
+          this.model.sort = "账外物资库房"
+        }
         this.visible = true;
         this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,'libraryName'))
+          this.form.setFieldsValue(pick(this.model,'libraryName','sort'))
           // this.form.setFieldsValue(pick(this.model,'createBy','createTime','updateBy','updateTime','sysOrgCode','libraryName','state','sort','delFlog','processDictionariesId'))
         })
       },
@@ -141,7 +147,12 @@ import { getAction, httpAction } from '@/api/manage'
                method = 'put';
             }
             let formData = Object.assign(this.model, values);
-            formData['processDictionariesId'] = this.mainId
+            formData['processDictionariesId'] = this.mainId;
+            if(formData.sort === '废旧物资库房'){
+              formData.sort = 1
+            }else if(formData.sort === '账外物资库房'){
+              formData.sort = 2
+            }
             console.log("表单提交数据",formData)
             httpAction(httpurl,formData,method).then((res)=>{
               if(res.success){
diff --git a/src/views/statisticanalysis/costecharts/Cost.vue b/src/views/statisticanalysis/costecharts/Cost.vue
index 7e5db33..0af7594 100644
--- a/src/views/statisticanalysis/costecharts/Cost.vue
+++ b/src/views/statisticanalysis/costecharts/Cost.vue
@@ -2,31 +2,11 @@
   <div style="width: 95%;height:100% ;background-color: #ffffff;margin-top: 2%;border-radius: 10px">
     <div style="height: 20%;margin-left: 6%;padding-top: 2%">
       <div style="font-size: 25px;margin-bottom: 5px;margin-bottom: 2%">公司成本
-        <span style="margin-left: 9%;margin-right: 2%">  <a-month-picker :disabled-date="disabledDate" placeholder="选择日期" />  </span>
-        <j-dict-select-tag type="list" v-model="materialType" style="width: 30%;margin-left: 2%"
+        <span style="margin-left: 9%;margin-right: 2%">  <a-month-picker :disabled-date="disabledDate" placeholder="选择日期"  @change="disabledDate"  v-model="formData.dateItem"/>  </span>
+        <j-dict-select-tag type="list" v-model="formData.materialType" style="width: 30%;margin-left: 2%"
                            :trigger-change="true" dictCode="material_type"
                            placeholder="请选择物资类型" @change="handleChange"/>
       </div>
-<!--    <div style="height: 25%;margin-left: 6%;padding-top: 2%">-->
-<!--      <div style="font-size: 25px;">公司成本-->
-<!--        <span style="">  <a-month-picker :disabled-date="disabledDate" placeholder="选择日期" />  </span>-->
-<!--        <j-dict-select-tag type="list" v-model="materialType" style="width: 30%"-->
-<!--                           :trigger-change="true" dictCode="material_type"-->
-<!--                           placeholder="请选择物资类型" @change="handleChange"/>-->
-<!--      </div>-->
-<!--      <div style="color: #ffffff;font-size: 19px;margin-bottom: 5px">公司成本</div>-->
-<!--      <div style="display: flex;align-items: center;justify-content: flex-start">-->
-<!--        <div class="xian">月</div>-->
-<!--        <div class="xian">季度</div>-->
-<!--        <div class="xian">半年</div>-->
-<!--        <div class="xian">年</div>-->
-<!--      </div>-->
-<!--      <div style="display: flex;align-items: center;justify-content: flex-start">-->
-<!--        <div class="zi">生产类物资</div>-->
-<!--        <div class="zi">非生产类物资</div>-->
-<!--        <div class="zi">科研类物资</div>-->
-<!--        <div class="zi">无形类资产</div>-->
-<!--      </div>-->
     </div>
     <div ref="myChartCon" style="width: 95%; height: 80%"></div>
   </div>
@@ -36,6 +16,9 @@
 <script>
 
 import echarts from 'echarts'
+import moment from 'moment'
+import { getAction } from '@api/manage'
+import { FilterTime,GetRecentMonth } from '@/utils/costTime'
 
 // 引入基本模板
 // let echarts = require('echarts/lib/echarts')
@@ -50,12 +33,59 @@ name: "Cost",
     return {
       msg: '我的echarts图表',
       materialType: null,
+      url:{
+        getSection: '/hy/processStatistics/getSection',
+      },
+      timeNum:[],
+      formData:{
+        dateItem: undefined,
+        materialType: 3,
+      },
+
     }
   },
   mounted() {
-    this.drawLine()
+
+  },
+  created() {
+    this.formData.dateItem = moment(new Date(), 'YYYY-MM');
+    this.getList();
   },
   methods: {
+    getList() {
+      this.timeNum = [];
+      // console.log( this.formData.dateItem,"====");
+      let date = new Date(this.formData.dateItem);
+      this.timeNum = GetRecentMonth(date.getMonth() + 1,this.timeNum)
+
+      // console.log(ss,"sdasDFsd");
+      let it ={
+        time: moment(this.formData.dateItem._d).format('YYYY-MM-DD HH:mm:ss'),
+        materialsType : this.formData.materialType
+      }
+      // console.log("====",moment(this.formData.dateItem._d).format('YYYY-MM-DD HH:mm:ss'));
+      getAction(this.url.getSection,it).then(res=>{
+        this.cost = res.result;
+        console.log("===123132",res.result);
+        let shuju = [];
+        let dux= {}
+        res.result.forEach(item =>{
+          // console.log("item",parseInt( item.createTime.substring(5,7) ));
+          dux= {
+            sj : parseInt( item.createTime.substring(5,7) ),
+            lld : item.materialAmount
+          }
+          shuju.push(dux);
+        });
+        // console.log(shuju);
+        this.drawLine(shuju);
+
+      })
+
+    },
+
+
+
     disabledDate(current) {
       // Can not select days before today and today
       return current && current < moment().endOf('day');
diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue
index 87d8258..a7e6d48 100644
--- a/src/views/system/UserList.vue
+++ b/src/views/system/UserList.vue
@@ -167,7 +167,7 @@
         </template>
 
         <template slot="realname" slot-scope="text, record, index">
-        <a  @click="handleEdit(record)">{{record.realname}}</a>
+        <a  @click="handleEdits(record)">{{record.realname}}</a>
         </template>
 
         <span slot="action" slot-scope="text, record">
@@ -184,8 +184,8 @@
 <!--                <a href="javascript:;" @click="handleDetail(record)">详情</a>-->
 <!--              </a-menu-item>-->
 
-              <a-menu-item>
-                <a href="javascript:;" @click="handleChangePassword(record.username)">密码</a>
+              <a-menu-item v-has="'user:password'">
+                <a href="javascript:;" @click="handleChangePassword(record.username)" >密码</a>
               </a-menu-item>
 
               <a-menu-item>
@@ -236,6 +236,7 @@
   import JSuperQuery from '@/components/jeecg/JSuperQuery'
   import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
   import JSelectPosition from '@comp/jeecgbiz/JSelectPosition'
+  import { SYS_BUTTON_AUTH, USER_AUTH } from '@/store/mutation-types'
 
   export default {
     name: "UserList",
@@ -364,7 +365,25 @@
         return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
       }
     },
+    created() {
+      // this.handleEdit();
+    },
     methods: {
+      handleEdits(record){
+        let authList = JSON.parse(sessionStorage.getItem(USER_AUTH) || "[]");
+        let kai = false;
+        for (let auth of authList) {
+          if(auth.action === 'user:edit'){
+            kai = true;
+          }
+        }
+        if(kai){
+          this.$refs.modalForm.edit(record);
+          this.$refs.modalForm.title = "编辑";
+          this.$refs.modalForm.disableSubmit = false;
+        }
+
+      },
       setimgurl(avatar){
         this.imgurl=this.getAvatarView(avatar)
         document.getElementById('imgs').click();