修改功能

src/api/user.js

@@ -37,3 +37,11 @@ export function importMember(data) {
     data
   })
 }
+// 万科后台_根据id修改一条会员数据
+export function updateMember(data) {
+  return request({
+    url: 'umsMember/updateById',
+    method: 'post',
+    data
+  })
+}

src/views/inv/DepotAdmin.vue

@@ -26,10 +26,24 @@
                            align="center">
             <template slot-scope="scope">{{scope.row.createtime | formatTime}}</template>
           </el-table-column>
+          <el-table-column label="状态"
+                           align="center">
+            <template slot-scope="scope">{{scope.row.status? '启用': '禁用'}}</template>
+          </el-table-column>
           <el-table-column label="操作"
                            align="center">
             <template slot-scope="scope">
               <el-button size="mini"
+                         type="warning"
+                         @click="handleUpdate(scope.row)">
+               修改
+              </el-button>
+              <el-button size="mini"
+                         type="primary"
+                         @click="handleDisable(scope.row)">
+                {{scope.row.status? '禁用': '启用'}}
+              </el-button>
+              <el-button size="mini"
                          type="danger"
                          @click="handleDelete(scope.row.id)">删除
               </el-button>
@@ -125,6 +139,15 @@ export default {
     handleAdd() {
       this.$refs.addDepot.add()
     },
+    handleDisable(row){
+      let status = row.status? '0': '1'
+      editDepartment({id: row.id,status: status }).then(res=>{
+        this.getList()
+      })
+    },
+    handleUpdate(row){
+      this.$refs.addDepot.update(row)
+    },
     // 删除
     handleDelete(id){
       this.$confirm('是否删除该库房?', '提示', {

src/views/inv/StoreList.vue

@@ -248,7 +248,7 @@ export default {
     },
     // 库房
     getStockRooms(){
-      getStockRooms().then(res=>{
+      getStockRooms({status: 1}).then(res=>{
         this.depotOptions = res.data.list
       })
     },

src/views/inv/WarehouseAdmin.vue

@@ -235,7 +235,7 @@ export default {
     },
     // 库房
     getStockRooms() {
-      getStockRooms().then(res => {
+      getStockRooms({status: 1}).then(res => {
         this.depotOptions = res.data.list
       })
     },

src/views/inv/modules/addDepot.vue

@@ -26,7 +26,7 @@
   </el-dialog>
 </template>
 <script>
-import { addDepartment} from '@/api/inventory'
+import { addDepartment,editDepartment} from '@/api/inventory'
 
 // 移动属性
 export default {
@@ -59,6 +59,14 @@ export default {
       this.init()
       this.visible= true
     },
+    update(row){
+      let obj = JSON.stringify(row)
+      this.title="修改库房"
+      this.init()
+      this.model = JSON.parse(obj)
+      this.id =  this.model.id
+      this.visible= true
+    },
     // detail (id) {
     //   this.id = id
     //   this.init()
@@ -78,13 +86,24 @@ export default {
       this.$refs.myForm.validate((valid) => {
         if (valid) {
           // 验证通过
-          addDepartment(this.model).then(res => {
-            this.loading = false
-            this.visible = false
-            this.$emit('ok')
-          }).catch(err => {
-            this.loading = false
-          })
+          if(this.id){
+            editDepartment({id: this.id,name: this.model.name}).then(res => {
+              this.loading = false
+              this.visible = false
+              this.$emit('ok')
+            }).catch(err => {
+              this.loading = false
+            })
+          }else {
+            addDepartment(this.model).then(res => {
+              this.loading = false
+              this.visible = false
+              this.$emit('ok')
+            }).catch(err => {
+              this.loading = false
+            })
+          }
+
         }
       })
     },

src/views/inv/modules/addGoodsModal.vue

@@ -212,7 +212,7 @@ export default {
     },
     // 库房
     getStockRooms() {
-      getStockRooms().then(res => {
+      getStockRooms({status: 1}).then(res => {
         this.depotOptions = res.data.list
       })
     },

src/views/inv/modules/importGoodsModal.vue

@@ -5,17 +5,22 @@
              width="1000px"
              :close-on-click-modal="false">
     <!--  excel表格上传  -->
-    <el-upload
-      :auto-upload="false"
-      :on-change="elInFile"
-      :on-remove="remove"
-      ref="upload"
-      action="https://jsonplaceholder.typicode.com"
-      class="upload-demo"
-      accept=".xlsx, .xls">
-      <el-button slot="trigger" size="mini" type="primary" plain>选取文件</el-button>
-      <div slot="tip" class="el-upload__tip">只能选取Excel文件</div>
-    </el-upload>
+    <div class="operate">
+      <div>
+        <el-upload
+          :auto-upload="false"
+          :on-change="elInFile"
+          :on-remove="remove"
+          ref="upload"
+          action="https://jsonplaceholder.typicode.com"
+          class="upload-demo"
+          accept=".xlsx, .xls">
+          <el-button slot="trigger" size="mini" type="primary" plain>选取文件</el-button>
+          <div slot="tip" class="el-upload__tip">只能选取Excel文件</div>
+        </el-upload>
+      </div>
+      <p @click="exportEntry" class="color-main">下载模板</p>
+    </div>
     <div class="scroll-container no-bottom"
          ref="scrollContainer">
       <el-form :model="formData" ref="formData">
@@ -283,6 +288,19 @@ export default {
     }
   },
   methods: {
+    // 下载模板
+    exportEntry(row) {
+      require.ensure([], () => {
+        let { exportJsonToExcel } = require('../../../../static/Export2Excel')
+        // 表头
+        let tHeader = ['物品名称', '型号','条形码', '物品类别', '数量', '价格', '供应商','所属库房']
+        exportJsonToExcel(tHeader,[], '导入物品模板') //导出文件
+      })
+    },
+    // 数据格式化
+    formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => v[j]))
+    },
     // 物品类别
     getGoodsCategoryList() {
       getGoodsCategoryList().then(res => {
@@ -297,7 +315,7 @@ export default {
     },
     // 库房
     getStockRooms() {
-      getStockRooms().then(res => {
+      getStockRooms({status: 1}).then(res => {
         this.depotOptions = res.data.list
       })
     },
@@ -437,7 +455,7 @@ export default {
       rd.onload = e => {  //this.readAsArrayBuffer函数内，会回调this.onload函数。在这里处理结果
         let sheetArray = rd.read2JS()
         let tables = []
-        for (var sheet of sheetArray.Sheet1) {
+        for (var sheet of sheetArray.SheetJS) {
           let rowTable = {}
           rowTable.isOK = true
           rowTable.name = sheet['物品名称']
@@ -499,7 +517,14 @@ export default {
     overflow: hidden;
     overflow-y: auto;
   }
-
+.operate{
+  display: flex;
+  align-items: baseline;
+}
+.operate .color-main{
+  text-decoration: underline;
+  cursor: pointer;
+}
   .input-width {
     width: 100px;
   }

src/views/inv/modules/inventoryDetailsModal.vue

@@ -2,7 +2,6 @@
   <el-dialog :visible.sync="visible"
              :title="title"
              center
-             @close="close"
              width="720px">
     <!-- start -->
     <div class="scroll-container no-bottom"
@@ -106,15 +105,13 @@ export default {
 
     },
     update(row){
+      let obj = JSON.stringify(row)
       this.init()
       this.title = '修改物品详情'
       this.isEdit = true
-      this.formData.tableData = row.vorList
+      this.formData.tableData = JSON.parse(obj).vorList
     },
     close() {
-      if(this.isEdit){
-        this.$emit('ok')
-      }
       this.visible = false
     },
     submit(formName) {

src/views/inv/modules/scanOutStorage.vue

@@ -249,7 +249,7 @@ export default {
     },
     // 库房
     getStockRooms() {
-      getStockRooms().then(res => {
+      getStockRooms({status: 1}).then(res => {
         this.depotOptions = res.data.list
       })
     },

src/views/inv/modules/scanPutStorage.vue

@@ -226,7 +226,7 @@ export default {
     },
     // 库房
     getStockRooms() {
-      getStockRooms().then(res => {
+      getStockRooms({status: 1}).then(res => {
         this.depotOptions = res.data.list
       })
     },

src/views/inv/modules/updateNumModal.vue

@@ -2,7 +2,6 @@
   <el-dialog :visible.sync="visible"
              :title="title"
              center
-             @close="close"
              width="500px">
     <!-- start -->
     <el-form :model="model"
@@ -78,9 +77,10 @@ export default {
     },
     update(row){
       this.id = null
+      let obj = JSON.stringify(row)
       this.title="修改出库数量"
       this.init()
-      this.model = row
+      this.model = JSON.parse(obj)
       this.visible= true
     },
 
@@ -100,7 +100,6 @@ export default {
       })
     },
     close () {
-      this.$emit('ok')
       this.visible = false
     }
   }

src/views/inv/modules/updateStoreModal.vue

@@ -2,7 +2,6 @@
   <el-dialog :visible.sync="visible"
              :title="title"
              center
-             @close="close"
              width="500px">
     <!-- start -->
     <el-form :model="model"
@@ -15,7 +14,8 @@
         <el-input size="small"
                   class="input-width"
                   placeholder="请输入物品名称"
-                  v-model="model.name"></el-input>
+                  v-model="model.name"
+                  :disabled="model.customId? true: false"></el-input>
       </el-form-item>
       <el-form-item label="型号："
                     :rules="[{required: true, trigger: 'blur', message: '请输入型号'}]"
@@ -23,7 +23,8 @@
         <el-input size="small"
                   class="input-width"
                   placeholder="请输入型号"
-                  v-model="model.goodsNo"></el-input>
+                  v-model="model.goodsNo"
+                  :disabled="model.customId? true: false"></el-input>
       </el-form-item>
       <el-form-item label="数量："
                     :rules="[{validator: validateNum,trigger: 'blur'}]"
@@ -33,20 +34,61 @@
                   placeholder="请输入数量"
                   v-model="model.goodsNum"></el-input>
       </el-form-item>
-      <el-form-item label="条形码：">
-        <span>{{model.barCode}}</span>
+      <el-form-item label="条形码："
+                    prop="barCode"
+                    :rules="[{required: true, trigger: 'blur', message: '请输入条形码'}]">
+        <el-input size="small"
+                  class="input-width"
+                  placeholder="请输入条形码"
+                  v-model="model.barCode"
+                  :disabled="model.customId? true: false"></el-input>
       </el-form-item>
-      <el-form-item label="物品类别：">
-        <span>{{model.goodsCategoryName}}</span>
+      <el-form-item label="物品类别："
+                    :rules="[{required: true,message: '请选择物品类别',trigger: 'change'}]">
+        <el-select v-model="model.goodsCategoryId"
+                   class="input-width"
+                   clearable
+                   placeholder="请选择物品类别"
+                   :disabled="model.customId? true: false">
+          <el-option v-for="item in categoryOptions"
+                     :key="item.id"
+                     :label="item.name"
+                     :value="item.id"></el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="价格：">
-        <span>{{model.price}}</span>
+      <el-form-item label="价格：" prop="price"
+                    :rules="[{validator: validatePrice,trigger: 'blur'}]">
+        <el-input  v-model="model.price" class="input-width"
+                  placeholder="价格"
+                   :disabled="model.customId? true: false"></el-input>
       </el-form-item>
-      <el-form-item label="供应商：">
-        <span>{{model.supplierName}}</span>
+      <el-form-item label="供应商："
+                    prop="supplierId"
+                    :rules="[{required: true,trigger: 'change',message: '供应商不能为空'}]">
+        <el-select v-model="model.supplierId"
+                   class="input-width"
+                   clearable
+                   placeholder="供应商"
+                   :disabled="model.customId? true: false">
+          <el-option v-for="item in supplierOptions"
+                     :key="item.id"
+                     :label="item.supplierName"
+                     :value="item.id"></el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="所属库房：">
-        <span>{{model.stockRoomName}}</span>
+      <el-form-item label="所属库房："
+                    :rules="[{required: true,trigger: 'change',message: '库房不能为空'}]"
+      >
+        <el-select  v-model="model.stockRoomId"
+                   class="input-width"
+                   clearable
+                   placeholder="库房"
+                    :disabled="model.customId || ($store.getters.type == 2)? true: false">
+          <el-option v-for="item in depotOptions"
+                     :key="item.id"
+                     :label="item.name"
+                     :value="item.id"></el-option>
+        </el-select>
       </el-form-item>
     </el-form>
     <div slot="footer">
@@ -58,11 +100,23 @@
   </el-dialog>
 </template>
 <script>
-import { updateGoods } from '@/api/inventory'
+import { getGoodsList,getGoodsCategoryList,getStockRooms, updateGoods } from '@/api/inventory'
+import {getSuppliersList} from '@/api/supplier'
 // 移动属性
 export default {
   name: 'updateStoreModal',
   data () {
+    var validatePrice = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('价格不能为空'))
+      } else {
+        let priceReg = /^[0-9]+(.[0-9]{2})?$/
+        if (!priceReg.test(value)) {
+          callback(new Error('价格不符合要求'))
+        }
+        callback()
+      }
+    }
     var validateNum = (rule, value, callback) => {
       if (value === '') {
         callback(new Error('数量不能为空'))
@@ -75,25 +129,89 @@ export default {
       }
     }
     return {
+      validatePrice: validatePrice,
       validateNum: validateNum,
       visible: false,
       title: null,
       loading: false,
       id: null,
-      model: {}
+      model: {},
+      categoryOptions: [],
+      supplierOptions: [],
+      depotOptions: [],
+      goodsList: []
+
     }
   },
   methods: {
+    // 物品
+    getGoodsList() {
+      console.log(12121212)
+      getGoodsList().then(res => {
+        for (var i of res.data.list) {
+          i.value = i.name
+        }
+        this.goodsList = res.data.list
+      })
+    },
+
+    // 物品类别
+    getGoodsCategoryList(){
+      getGoodsCategoryList().then(res=>{
+        this.categoryOptions = res.data.list
+      })
+    },
+    // 供应商
+    getSuppliersList(){
+      getSuppliersList().then(res=>{
+        this.supplierOptions =  res.data.list
+      })
+    },
+    // 库房
+    getStockRooms(){
+      getStockRooms({status: 1}).then(res=>{
+        this.depotOptions = res.data.list
+      })
+    },
+    handleSelect(name) {
+      let item = this.goodsList.filter(good => good.name === name)[0]
+      this.model.customId = item.id
+      this.model.goodsNo = item.goodsNo
+      this.model.barCode = item.barCode
+      this.model.stockRoomId = item.stockRoomId
+      this.model.price = item.price
+      this.model.supplierId = item.supplierId
+      this.model.goodsCategoryId = item.goodsCategoryId
+      console.log('item', item)
+    },
+    querySearch(queryString, cb) {
+      var goodsList = this.goodsList
+      var results = queryString ? goodsList.filter(this.createFilter(queryString)) : goodsList
+      // 调用 callback 返回建议列表的数据
+      cb(results)
+    },
+    createFilter(queryString) {
+      return (restaurant) => {
+        return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
+      }
+    },
     init () {
+      this.getGoodsList()
+      this.getGoodsCategoryList()
+      this.getSuppliersList()
+      this.getStockRooms()
       this.$nextTick(() => {
         this.$refs.attributeForm.clearValidate()
       })
     },
     update(row){
       this.id = null
+      let obj = JSON.stringify(row)
       this.title="修改出库数量"
+      // let item = this.goodsList.filter(good => good.name === this.model.name)[0]
+      // this.model.customId = item.id
       this.init()
-      this.model = row
+      this.model = JSON.parse(obj)
       this.visible= true
     },
 
@@ -113,7 +231,6 @@ export default {
       })
     },
     close () {
-      this.$emit('ok')
       this.visible = false
     }
   }

src/views/sta/Recipients.vue

@@ -41,6 +41,16 @@
                        :value="item.id"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="出库日期：" >
+          <el-date-picker
+            v-model="dataRange"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item>
           <el-button type="primary"
                      @click="handleSearchList"
@@ -79,12 +89,13 @@ const defaultListQuery = {
   pageSize: 10,
   goodsId: '',
   supplierId: '',
-  goodsCategoryId: ''
+  goodsCategoryId: '',
 }
 export default {
   name: 'Recipients',
   data() {
     return {
+      dataRange: [],
       categoryOptions: [],
       supplierOptions: [],
       goodOptions: [],
@@ -113,6 +124,7 @@ export default {
   },
   created() {
     this.getSuppliersList()
+    this.formatEveryDay()
     // this.getData()
   },
   filters: {
@@ -157,8 +169,8 @@ export default {
         dateList.push(year + '-' + month + '-' + day)
         startTime.setDate(startTime.getDate() + 1)
       }
-      console.log('dateList',dateList)
-      return dateList
+      console.log(' this.dataRange',dateList, this.dataRange)
+      this.dataRange = [dateList[0],dateList[dateList.length-1]]
     },
     getDate(datestr) {
       var temp = datestr.split('-')
@@ -197,17 +209,17 @@ export default {
         this.supplierOptions = res.data.list
       })
     },
-
     getList() {
       if(!this.listQuery.goodsId){
         this.$message.warning('请选择物品')
         return
       }
-      getRecipientList({ dateList: this.formatEveryDay(), goodsId: this.listQuery.goodsId }).then(res => {
+      getRecipientList({ dateList: this.dataRange, goodsId: this.listQuery.goodsId }).then(res => {
         this.chartData.rows = res.data
       })
     },
     handleResetSearch() {
+      this.dataRange  = null
       this.listQuery = Object.assign({}, defaultListQuery)
       this.getList()
     },

src/views/use/UserList.vue

@@ -67,11 +67,20 @@
                            align="center">
             <template slot-scope="scope">{{scope.row.phone}}</template>
           </el-table-column>
+          <el-table-column label="状态"
+                           align="center">
+            <template slot-scope="scope">{{scope.row.status? '启用': '禁用'}}</template>
+          </el-table-column>
           <el-table-column label="操作"
                            width="220"
                            align="center">
             <template slot-scope="scope">
               <el-button size="mini"
+                         type="primary"
+                         @click="handleDisable(scope.row)">
+                {{scope.row.status? '禁用': '启用'}}
+              </el-button>
+              <el-button size="mini"
                          type="success"
                          @click="handleSet(scope.row)">设置为管理员
               </el-button>
@@ -103,7 +112,7 @@
 </template>
 <script>
 import moment from 'moment'
-import { getMemberList, getAuditDetail, updateMcht } from '@/api/user'
+import { getMemberList, getAuditDetail, updateMcht,updateMember } from '@/api/user'
 import { getDepartmentList } from '@/api/inventory'
 import AddAdmin from './modules/AddAdmin'
 import ImportMemberModal from './modules/importMemberModal'
@@ -187,7 +196,13 @@ export default {
     // 设置为管理员
     handleSet(row) {
       this.$refs.addAdmin.add(row)
-    }
+    },
+    handleDisable(row){
+      let status = row.status? '0': '1'
+      updateMember({id: row.id,status: status }).then(res=>{
+        this.getList()
+      })
+    },
   }
 }
 </script>

src/views/use/modules/AddAdmin.vue

@@ -86,7 +86,7 @@ export default {
   methods: {
     // 库房
     getStockRooms() {
-      getStockRooms().then(res => {
+      getStockRooms({status: 1}).then(res => {
         this.depotOptions = res.data.list
       })
     },

src/views/use/modules/importMemberModal.vue

@@ -5,17 +5,23 @@
              width="1000px"
              :close-on-click-modal="false">
     <!--  excel表格上传  -->
-    <el-upload
-      :auto-upload="false"
-      :on-change="elInFile"
-      :on-remove="remove"
-      ref="upload"
-      action="https://jsonplaceholder.typicode.com"
-      class="upload-demo"
-      accept=".xlsx, .xls">
-      <el-button slot="trigger" size="mini" type="primary" plain>选取文件</el-button>
-      <div slot="tip" class="el-upload__tip">只能选取Excel文件</div>
-    </el-upload>
+    <div class="operate">
+      <div>
+        <el-upload
+          :auto-upload="false"
+          :on-change="elInFile"
+          :on-remove="remove"
+          ref="upload"
+          action="https://jsonplaceholder.typicode.com"
+          class="upload-demo"
+          accept=".xlsx, .xls">
+          <el-button slot="trigger" size="mini" type="primary" plain>选取文件</el-button>
+          <div slot="tip" class="el-upload__tip">只能选取Excel文件</div>
+        </el-upload>
+      </div>
+      <p @click="exportEntry" class="color-main">下载模板</p>
+    </div>
+
     <div class="scroll-container no-bottom"
          ref="scrollContainer">
       <el-form :model="formData" ref="formData">
@@ -195,6 +201,15 @@ export default {
     }
   },
   methods: {
+    // 下载模板
+    exportEntry(row) {
+      require.ensure([], () => {
+        let { exportJsonToExcel } = require('../../../../static/Export2Excel')
+        // 表头
+        let tHeader = ['账号', '用户名称','员工编号', '手机号', '部门名称']
+        exportJsonToExcel(tHeader,[], '导入用户模板') //导出文件
+      })
+    },
     init() {
       this.formData.tableData = []
       this.$nextTick(() => {
@@ -282,7 +297,7 @@ export default {
       rd.onload = e => {  //this.readAsArrayBuffer函数内，会回调this.onload函数。在这里处理结果
         let sheetArray = rd.read2JS()
         let tables = []
-        for (var sheet of sheetArray.Sheet1) {
+        for (var sheet of sheetArray.SheetJS) {
           let rowTable = {}
           rowTable.isOK = true
           rowTable.account = sheet['账号']
@@ -314,4 +329,12 @@ export default {
     color: #999;
     font-size: 10px;
   }
+  .operate{
+    display: flex;
+    align-items: baseline;
+  }
+  .operate .color-main{
+    text-decoration: underline;
+    cursor: pointer;
+  }
 </style>