物料管理优化

src/main.js

@@ -4,6 +4,10 @@ import 'normalize.css/normalize.css' // A modern alternative to CSS resets
 
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
+import './assets/styles/element-variables.scss'
+import '@/assets/styles/index.scss' // global css
+// import '@/assets/styles/ruoyi.scss' // ruoyi css
+
 import locale from 'element-ui/lib/locale/lang/en' // lang i18n
 import zh from 'element-ui/lib/locale/lang/zh-CN' // lang i18n
 import directive from './directive'
@@ -48,11 +52,17 @@ Vue.prototype.getMonthDate = getMonthDate
 Vue.component('DictTag', DictTag)
 
 
+// 修改 el-dialog 默认点击遮照为不关闭
+ElementUI.Dialog.props.closeOnClickModal.default = false
 
+Vue.use(ElementUI, {
+  locale: zh,
+  size: 'mini' // set element-ui default size
+})
 // set ElementUI lang to EN
 // Vue.use(ElementUI, { locale })
 // 如果想要中文版 element-ui，按如下方式声明
-Vue.use(ElementUI, {locale: zh})
+// Vue.use(ElementUI, {locale: zh})
 Vue.use(directive)
 Vue.use(auth)
 DictData.install()

src/utils/date.js

@@ -96,6 +96,20 @@ export default {
     return moment().add(num, 'weeks').format(DATE_FORMAT)
   },
 
+  lastDayOfWeek(date) {
+    if (date) {
+      return moment(date).endOf('week').format(DATE_FORMAT)
+    }
+    return moment().endOf('week').format(DATE_FORMAT)
+  },
+
+  firstDayOfNextWeek(date) {
+    if (date) {
+      return moment(date).add(1, 'weeks').startOf('week').format(DATE_FORMAT)
+    }
+    return moment(date).add(1, 'weeks').startOf('week').format(DATE_FORMAT)
+  },
+
   getFeedBackDate(dateRange, day) {
     let startYear = moment(dateRange[0]).year()
     let endYear = moment(dateRange[1]).year()

src/views/material/asset.vue

@@ -140,7 +140,7 @@
     </el-row>
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body >
       <el-row :gutter="20">
         <el-col :span="10">
           <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
@@ -258,7 +258,7 @@
     </el-dialog>
 
     <!-- 物品流转对话框 -->
-    <el-dialog title="物品流转" :visible.sync="transferOpen" width="800px" append-to-body :close-on-click-modal="false">
+    <el-dialog title="物品流转" :visible.sync="transferOpen" width="800px" append-to-body>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form ref="transferForm" :model="transferForm" :rules="transferRules" size="mini" label-width="100px">
@@ -349,7 +349,7 @@
     </el-dialog>
 
     <!-- 资产详情对话框 -->
-    <el-dialog title="资产详情" :visible.sync="detailOpen" width="800px" append-to-body :close-on-click-modal="false">
+    <el-dialog title="资产详情" :visible.sync="detailOpen" width="800px" append-to-body>
       <asset-detail :form="form"></asset-detail>
     </el-dialog>
 
@@ -616,6 +616,7 @@ export default {
           addTransfer(this.transferForm).then(res => {
             this.$message.success("流转成功");
             this.transferOpen = false;
+            this.resetForm("transferForm");
             this.getList();
           });
         }
@@ -636,9 +637,9 @@ export default {
   margin-bottom: 10px;
 }
 
-::v-deep.el-dialog__body {
-  padding: 10px 20px 30px 20px;
-}
+//.el-dialog::v-deep.el-dialog__body {
+//  padding: 10px 20px 30px 20px;
+//}
 
 .accessory-header {
   display: flex;

src/views/material/components/category.vue

@@ -35,7 +35,8 @@
                            v-hasPermi="['material:category:edit']">修改</el-button>
                 <el-button size="mini" type="danger" @click="handleDelete(data)"
                            v-hasPermi="['material:category:delete']">删除</el-button>
-                <i class="el-icon-share" slot="reference"></i>
+                <i class="el-icon-share" slot="reference"
+                   v-hasPermi="['material:category:add','material:category:edit','material:category:delete']"></i>
                </el-popover>
             </span>
       </el-tree>
@@ -131,7 +132,7 @@ export default {
     },
     /** 节点单击事件 */
     handleNodeClick(data) {
-      this.$emit('selectcategory', data.id)
+      this.$emit('selectCategory', data.id)
     },
 
     // 取消按钮

src/views/material/officeSupply.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true">
-      <el-form-item label="物料名称" prop="officeSupplyName">
+      <el-form-item label="物品名称" prop="officeSupplyName">
         <el-input
           v-model="queryParams.officeSupplyName"
-          placeholder="请输入物料名称"
+          placeholder="请输入物品名称"
           clearable
           style="width: 240px"
         />
@@ -112,7 +112,7 @@
                 type="month"
                 value-format="yyyy-MM"
                 placeholder="选择月份"
-                :picker-options="getPickerOptions"
+                :picker-options="pickerOptions"
                 clearable>
               </el-date-picker>
             </el-form-item>
@@ -271,8 +271,14 @@ export default {
         num: [
           {required: true, message: "数量不能为空", trigger: "blur"}
         ]
+      },
+
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < DateUtil.unix(DateUtil.afterMonth()) * 1000
+        }
       }
-    };
+    }
   },
   created() {
     this.getList();
@@ -335,13 +341,9 @@ export default {
       this.pageNum = val;
       this.getList();
     },
-    getPickerOptions() {
-      return {
-        disabledDate: time => time.getTime() < DateUtil.unix(DateUtil.afterMonth()) * 1000
-      }
-    },
+
     showEditBtn(row) {
-      if (DateUtil.getMinutes() < DateUtil.getMinutes(DateUtil.day(DateUtil.month() + '25'))) {
+      if (DateUtil.getMinutes() < DateUtil.getMinutes(DateUtil.day(DateUtil.month() + '-25'))) {
         return DateUtil.unix(row.month) >= DateUtil.unix(DateUtil.afterMonth())
       } else {
         return DateUtil.unix(row.month) >= DateUtil.unix(DateUtil.afterMonth())

src/views/material/receive.vue

@@ -474,7 +474,6 @@ export default {
         item.id = undefined
         return item
       })
-      console.log(this.addList);
     },
 
     handleSizeChange(val) {
@@ -492,11 +491,10 @@ export default {
         }
       }
       if (type === 'week') {
-        let time1 = DateUtil.unix(this.addForm.date) * 1000
-        let time2 = DateUtil.unix(DateUtil.afterWeek()) * 1000
-        let limitTime = time1 > time2 ? time1 : time2;
+        let limitTime = DateUtil.unix(DateUtil.firstDayOfNextWeek()) * 1000
         return {
-          disabledDate: time => time.getTime() < limitTime
+          firstDayOfWeek: 1,
+          disabledDate: time => time.getTime() <= limitTime
         }
       }
     },