修改

lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue

@@ -11,6 +11,22 @@
           label-width="90px"
           label-suffix=":"
         >
+          <el-form-item label="仓库">
+            <el-select
+              v-model="query.stor_id"
+              clearable
+              filterable
+              size="mini"
+              class="filter-item"
+              style="width: 200px;"
+            >
+              <el-option
+                v-for="item in storlist"
+                :label="item.stor_name"
+                :value="item.stor_id"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="仓位搜索">
             <el-input
               v-model="query.struct"
@@ -41,22 +57,6 @@
               class="filter-item"
             />
           </el-form-item>
-          <el-form-item label="下料区域">
-            <el-select
-              v-model="query.region_id"
-              clearable
-              filterable
-              size="mini"
-              class="filter-item"
-              style="width: 200px;"
-            >
-              <el-option
-                v-for="item in reginoList"
-                :label="item.region_name"
-                :value="item.region_id"
-              />
-            </el-select>
-          </el-form-item>
           <rrOperation :crud="crud" />
         </el-form>
       </div>
@@ -99,6 +99,7 @@ import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import crudPoint from '@/views/wms/sch/point/point'
+import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
 
 const defaultForm = { stockrecord_id: null, cascader: null, struct_id: null, struct_code: null, struct_name: null, workprocedure_id: null, material_id: null, material_code: null, quality_scode: null, pcsn: null, canuse_qty: null, frozen_qty: null, ivt_qty: null, warehousing_qty: null, qty_unit_id: null, instorage_time: null, sale_id: null }
 export default {
@@ -119,7 +120,7 @@ export default {
   },
   data() {
     return {
-      reginoList: [],
+      storlist: [],
       permission: {
       },
       rules: {
@@ -127,8 +128,8 @@ export default {
     }
   },
   created() {
-    crudPoint.getRegion().then(res => {
-      this.reginoList = res
+    crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
+      this.storlist = res.content
     })
   },
   methods: {

lms/nladmin-ui/src/views/wms/basedata/st/userStor/index.vue

@@ -13,58 +13,14 @@
           class="filter-item"
           @keyup.enter.native="crud.toQuery"
         />
-        <rrOperation />
+        <rrOperation/>
       </div>
-      <crudOperation :permission="permission" />
+      <crudOperation :permission="permission"/>
     </div>
     <!-- 表单渲染 -->
-    <el-dialog
-      append-to-body
-      :close-on-click-modal="false"
-      :before-close="crud.cancelCU"
-      :visible.sync="crud.status.cu > 0"
-      :title="crud.status.title"
-      width="520px"
-    >
-      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="80px">
-        <el-form-item label="角色名称" prop="name">
-          <el-input v-model="form.name" style="width: 380px;" />
-        </el-form-item>
-        <el-form-item label="角色级别" prop="level">
-          <el-input-number v-model.number="form.level" :min="1" controls-position="right" style="width: 145px;" />
-        </el-form-item>
-        <el-form-item label="数据范围" prop="dataScope">
-          <el-select v-model="form.dataScope" style="width: 140px" placeholder="请选择数据范围" @change="changeScope">
-            <el-option
-              v-for="item in dateScopes"
-              :key="item"
-              :label="item"
-              :value="item"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item v-if="form.dataScope === '自定义'" label="数据权限" prop="depts">
-          <treeselect
-            v-model="deptDatas"
-            :load-options="loadDepts"
-            :options="depts"
-            multiple
-            style="width: 380px"
-            placeholder="请选择"
-          />
-        </el-form-item>
-        <el-form-item label="描述信息" prop="description">
-          <el-input v-model="form.description" style="width: 380px;" rows="5" type="textarea" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="crud.cancelCU">取消</el-button>
-        <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-      </div>
-    </el-dialog>
     <el-row :gutter="15">
       <!--角色管理-->
-      <el-col :xs="24" :sm="24" :md="16" :lg="16" :xl="17" style="margin-bottom: 10px">
+      <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="17" style="margin-bottom: 10px">
         <el-card class="box-card" shadow="never">
           <div slot="header" class="clearfix">
             <span class="role-span">角色列表</span>
@@ -78,42 +34,25 @@
             @selection-change="crud.selectionChangeHandler"
             @current-change="handleCurrentChange"
           >
-            <el-table-column :selectable="checkboxT" type="selection" width="55" />
-            <el-table-column prop="name" label="名称" min-width="100" show-overflow-tooltip />
-            <el-table-column prop="dataScope" label="数据权限" />
-            <el-table-column prop="level" label="角色级别" />
-            <el-table-column show-overflow-tooltip prop="description" label="描述" />
-            <el-table-column show-overflow-tooltip width="135px" prop="createTime" label="创建日期">
+            <el-table-column show-overflow-tooltip prop="username" label="用户名"/>
+            <el-table-column show-overflow-tooltip prop="nick_name" label="姓名"/>
+            <el-table-column prop="name" label="部门"/>
+            <!--<el-table-column show-overflow-tooltip prop="dept" label="部门">
               <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.createTime) }}</span>
+                <div>{{ scope.row.dept.name }}</div>
               </template>
-            </el-table-column>
-            <el-table-column
-              v-permission="['admin','roles:edit','roles:del']"
-              label="操作"
-              width="130px"
-              align="center"
-              fixed="right"
-            >
-              <template slot-scope="scope">
-                <udOperation
-                  v-if="scope.row.level >= level"
-                  :data="scope.row"
-                  :permission="permission"
-                />
-              </template>
-            </el-table-column>
+            </el-table-column>-->
           </el-table>
           <!--分页组件-->
-          <pagination />
+          <pagination/>
         </el-card>
       </el-col>
       <!-- 菜单授权 -->
-      <el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="7">
+      <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="7">
         <el-card class="box-card" shadow="never">
           <div slot="header" class="clearfix">
             <el-tooltip class="item" effect="dark" content="选择指定角色分配菜单" placement="top">
-              <span class="role-span">菜单分配</span>
+              <span class="role-span">仓库选择</span>
             </el-tooltip>
             <el-button
               v-permission="['admin','roles:edit']"
@@ -137,21 +76,9 @@
               type="selection"
               width="55">
             </el-table-column>
-            <el-table-column
-              label="日期"
-              width="120">
-              <template slot-scope="scope">{{ scope.row.date }}</template>
-            </el-table-column>
-            <el-table-column
-              prop="name"
-              label="姓名"
-              width="120">
-            </el-table-column>
-            <el-table-column
-              prop="address"
-              label="地址"
-              show-overflow-tooltip>
-            </el-table-column>
+            <el-table-column prop="stor_code" label="仓库编码" />
+            <el-table-column prop="stor_name" label="仓库名称"/>
+            <el-table-column prop="simple_name" label="简称"/>
           </el-table>
         </el-card>
       </el-col>
@@ -177,44 +104,21 @@ export default {
   name: 'UserStor',
   components: { Treeselect, pagination, crudOperation, rrOperation, udOperation, DateRangePicker },
   cruds() {
-    return CRUD({ title: '角色', url: 'api/userStor', crudMethod: { ...crudUserStor }})
+    return CRUD({
+      title: '角色',
+      url: 'api/userStor',
+      crudMethod: { ...crudUserStor },
+      optShow: { add: false, reset: false, edit: false, del: false }
+    })
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   data() {
     return {
-      defaultProps: { children: 'children', label: 'label', isLeaf: 'leaf' },
-      dateScopes: ['全部', '本级', '自定义'], level: 3,
+      level: 3,
       currentId: 0, menuLoading: false, showButton: false,
       menus: [], menuIds: [], depts: [], deptDatas: [], // 多选时使用
-      tableData: [{
-        date: '2016-05-03',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1518 弄'
-      }, {
-        date: '2016-05-02',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1518 弄'
-      }, {
-        date: '2016-05-04',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1518 弄'
-      }, {
-        date: '2016-05-01',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1518 弄'
-      }, {
-        date: '2016-05-08',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1518 弄'
-      }, {
-        date: '2016-05-06',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1518 弄'
-      }, {
-        date: '2016-05-07',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1518 弄'
-      }],
+      tableData: [],
+      currentRow: null,
       permission: {
         add: ['admin', 'roles:add'],
         edit: ['admin', 'roles:edit'],
@@ -231,8 +135,8 @@ export default {
     }
   },
   created() {
-    crudRoles.getLevel().then(data => {
-      this.level = data.level
+    crudUserStor.queryStor({}).then(res => {
+      this.tableData = res
     })
   },
   methods: {
@@ -284,17 +188,18 @@ export default {
     // 触发单选
     handleCurrentChange(val) {
       if (val) {
-        const _this = this
-        // 清空菜单的选中
-        this.$refs.menu.setCheckedKeys([])
-        // 保存当前的角色id
-        this.currentId = val.id
-        // 初始化默认选中的key
-        this.menuIds = []
-        val.menus.forEach(function(data) {
-          _this.menuIds.push(data.id)
-        })
         this.showButton = true
+        this.$refs.multipleTable.clearSelection()
+        this.currentRow = val
+        crudUserStor.queryUserStor(val).then(res => {
+          res.forEach(row => {
+            this.tableData.forEach(selected => {
+              if (selected.stor_id === row.stor_id) {
+                this.$refs.multipleTable.toggleRowSelection(selected, true)
+              }
+            })
+          })
+        })
       }
     },
     menuChange(menu) {
@@ -321,20 +226,11 @@ export default {
     },
     // 保存菜单
     saveMenu() {
-      this.menuLoading = true
-      const role = { id: this.currentId, menus: [] }
-      // 得到已选中的 key 值
-      this.menuIds.forEach(function(id) {
-        const menu = { id: id }
-        role.menus.push(menu)
-      })
-      crudRoles.editMenu(role).then(() => {
+      const row = {}
+      row.jo = this.currentRow
+      row.rows = this.$refs.multipleTable.selection
+      crudUserStor.save(row).then(res => {
         this.crud.notify('保存成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        this.menuLoading = false
-        this.update()
-      }).catch(err => {
-        this.menuLoading = false
-        console.log(err.response.data.message)
       })
     },
     // 改变数据