完成样品管理权限，完成仓库新增和查询，仓库变更赋予货架列表数据

value

2024-04-06 5a53822c8983d4559eddb9d9af3d7710fb6321ef

完成样品管理权限，完成仓库新增和查询，仓库变更赋予货架列表数据

 package-lock.json

@@ -473,7 +473,7 @@
    },
    "@xmldom/xmldom": {
      "version": "0.8.10",
      "resolved": "https://registry.npmmirror.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
      "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw=="
    },
    "JSV": {
@@ -3583,7 +3583,7 @@
    },
    "dingbat-to-unicode": {
      "version": "1.0.1",
      "resolved": "https://registry.npmmirror.com/dingbat-to-unicode/-/dingbat-to-unicode-1.0.1.tgz",
      "resolved": "https://registry.npmjs.org/dingbat-to-unicode/-/dingbat-to-unicode-1.0.1.tgz",
      "integrity": "sha512-98l0sW87ZT58pU4i61wa2OHwxbiYSbuxsCBozaVnYX2iCnr3bLM3fIes1/ej7h1YdOKuKt/MLs706TVnALA65w=="
    },
    "dir-glob": {
@@ -3697,7 +3697,7 @@
    },
    "duck": {
      "version": "0.1.12",
      "resolved": "https://registry.npmmirror.com/duck/-/duck-0.1.12.tgz",
      "resolved": "https://registry.npmjs.org/duck/-/duck-0.1.12.tgz",
      "integrity": "sha512-wkctla1O6VfP89gQ+J/yDesM0S7B7XLXjKGzXxMDVFg7uEn706niAtyYovKbyq1oT9YwDcly721/iUWoc8MVRg==",
      "requires": {
        "underscore": "^1.13.1"
@@ -3705,7 +3705,7 @@
      "dependencies": {
        "underscore": {
          "version": "1.13.6",
          "resolved": "https://registry.npmmirror.com/underscore/-/underscore-1.13.6.tgz",
          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
          "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A=="
        }
      }
@@ -6292,7 +6292,7 @@
    },
    "lop": {
      "version": "0.4.1",
      "resolved": "https://registry.npmmirror.com/lop/-/lop-0.4.1.tgz",
      "resolved": "https://registry.npmjs.org/lop/-/lop-0.4.1.tgz",
      "integrity": "sha512-9xyho9why2A2tzm5aIcMWKvzqKsnxrf9B5I+8O30olh6lQU8PH978LqZoI4++37RBgS1Em5i54v1TFs/3wnmXQ==",
      "requires": {
        "duck": "^0.1.12",
@@ -6302,7 +6302,7 @@
      "dependencies": {
        "underscore": {
          "version": "1.13.6",
          "resolved": "https://registry.npmmirror.com/underscore/-/underscore-1.13.6.tgz",
          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
          "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A=="
        }
      }
@@ -6385,7 +6385,7 @@
    },
    "mammoth": {
      "version": "1.7.1",
      "resolved": "https://registry.npmmirror.com/mammoth/-/mammoth-1.7.1.tgz",
      "resolved": "https://registry.npmjs.org/mammoth/-/mammoth-1.7.1.tgz",
      "integrity": "sha512-ckxfvNH5sUaJh+SbYbxpvB7urZTGS02jA91rFCNiL928CgE9FXXMyXxcJBY0n+CpmKE/eWh7qaV0+v+Dbwun3Q==",
      "requires": {
        "@xmldom/xmldom": "^0.8.6",
@@ -6402,12 +6402,12 @@
      "dependencies": {
        "bluebird": {
          "version": "3.4.7",
          "resolved": "https://registry.npmmirror.com/bluebird/-/bluebird-3.4.7.tgz",
          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz",
          "integrity": "sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA=="
        },
        "jszip": {
          "version": "3.10.1",
          "resolved": "https://registry.npmmirror.com/jszip/-/jszip-3.10.1.tgz",
          "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz",
          "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
          "requires": {
            "lie": "~3.3.0",
@@ -6418,7 +6418,7 @@
        },
        "underscore": {
          "version": "1.13.6",
          "resolved": "https://registry.npmmirror.com/underscore/-/underscore-1.13.6.tgz",
          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
          "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A=="
        }
      }
@@ -7894,7 +7894,7 @@
    },
    "option": {
      "version": "0.2.4",
      "resolved": "https://registry.npmmirror.com/option/-/option-0.2.4.tgz",
      "resolved": "https://registry.npmjs.org/option/-/option-0.2.4.tgz",
      "integrity": "sha512-pkEqbDyl8ou5cpq+VsnQbe/WlEy5qS7xPzMS1U55OCG9KPvwFD46zDbxQIj3egJSFc3D+XhYOPUzz49zQAVy7A=="
    },
    "ora": {
@@ -13829,7 +13829,7 @@
    },
    "xmlbuilder": {
      "version": "10.1.1",
      "resolved": "https://registry.npmmirror.com/xmlbuilder/-/xmlbuilder-10.1.1.tgz",
      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-10.1.1.tgz",
      "integrity": "sha512-OyzrcFLL/nb6fMGHbiRDuPup9ljBycsdCypwuyg5AAHvyWzGfChJpCXMG88AGTIMFhGZ9RccFN1e6lhg3hkwKg=="
    },
    "xmlchars": {

 src/assets/api/controller.js

@@ -15,7 +15,8 @@
        insOrder,
        sampleOrder,
    insOrderPlan,
    insReport
    insReport,
    warehouse
    }
}

@@ -182,3 +183,8 @@
  pageInsReport: "/insReport/pageInsReport", //查询检验报告数据
  wordToHtml: "/insReport/wordToHtml", //Word转HTML
}

const warehouse = {
  addWarehouse: "/warehouse/addWarehouse", //添加仓库
  selectWarehouse: "/warehouse/selectWarehouse", //查询仓库
}

 src/components/view/b1-sample.vue

@@ -168,12 +168,8 @@
                <div class="search_thing">
                    <div class="search_label">仓库名称：</div>
                    <div class="search_input">
            <el-select v-model="entity.status" placeholder="全部" size="small">
              <el-option
                v-for="item in statusList"
                :key="item.value"
                :label="item.label"
                :value="item.value">
            <el-select v-model="entity.warehouseId" placeholder="选择仓库" size="small" @change="warehouseChange">
              <el-option v-for="item in warehouse" :key="item.id" :label="item.name" :value="item.id">
              </el-option>
            </el-select>
          </div>
@@ -181,24 +177,21 @@
                <div class="search_thing">
                    <div class="search_label">货架：</div>
                    <div class="search_input">
            <el-select v-model="entity.status" placeholder="全部" size="small">
              <el-option
                v-for="item in statusList"
                :key="item.value"
                :label="item.label"
                :value="item.value">
            <el-select v-model="entity.shelfId" placeholder="选择货架" size="small">
              <el-option v-for="item in shelf" :key="item.id" :label="item.name" :value="item.id">
              </el-option>
            </el-select>
          </div>
                </div>
                <div class="search_thing" style="padding-left: 30px;">
        <!-- <div class="search_thing" style="padding-left: 30px;">
                    <el-button size="small" @click="refresh()">重 置</el-button>
                    <el-button size="small" type="primary" @click="refreshTable()">查 询</el-button>
                </div>
                </div> -->
        <div class="btns">
          <el-button size="small" style="color:#3A7BFA" @click="keepVisible=true">维护</el-button>
          <el-button size="small" style="color:#3A7BFA" @click="warehouseVisible=true">添加仓库</el-button>
          <el-button size="small" style="color:#3A7BFA" @click="shelvesVisible=true">添加货架</el-button>
          <el-button size="small" style="color:#3A7BFA" @click="shelvesVisible=true"
            :disabled="entity.warehouseId==null">添加货架</el-button>
        </div>
            </div>
            <div class="table">
@@ -208,7 +201,8 @@
                <td v-for="(m,i) in item" :key="i" class="content">
                  <h4>{{ m.title }}</h4>
                  <ul>
                    <li v-for="(n,j) in m.list" :key="j" :class="{blue:n.type==0,green:n.type==1}" @click="handelDetail(n)">
                  <li v-for="(n,j) in m.list" :key="j" :class="{blue:n.type==0,green:n.type==1}"
                    @click="handelDetail(n)">
                      <i></i>
                      <span>{{ n.name }}</span>
                      <span>&nbsp;({{ n.specs }})&nbsp;</span>
@@ -218,7 +212,8 @@
                </td>
              </tr>
              <tr>
                <td v-for="(item,index) in rowList" :key="index" style="background: ghostwhite;height: 20px;">{{ item }}</td>
              <td v-for="(item,index) in rowList" :key="index" style="background: ghostwhite;height: 20px;">{{ item }}
              </td>
              </tr>
            </tbody>
        </table>
@@ -275,7 +270,7 @@
            </span>
        </el-dialog>
    <el-dialog title="库位维护" :visible.sync="keepVisible" width="350px">
      <el-tree :data="list" ref="tree" :props="{ children: 'children', label: 'label' }" node-key="label"
      <el-tree :data="warehouse" ref="tree" :props="{ children: 'warehouseShelfList', label: 'name' }" node-key="id"
                    :filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current @node-expand="nodeOpen"
                    @node-collapse="nodeClose" :default-expanded-keys="expandedKeys" v-if="keepVisible">
                    <div class="custom-tree-node" style="width: 100%;" slot-scope="{ node, data }">
@@ -283,16 +278,12 @@
                            <el-col :span="20">
                                <span><i
                                        :class="`node_i ${data.children != undefined ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i>
                                    {{ data.code }} {{ data.label }}</span>
                {{ data.name }}</span>
                            </el-col>
              <el-col :span="4" v-if="node.level<3">
                <el-button
                  type="text"
                  size="mini" icon="el-icon-edit" @click.stop="handleEdit(data,node.level)">
              <el-button type="text" size="mini" icon="el-icon-edit" @click.stop="handleEdit(data,node.level)">
                </el-button>
                <el-button
                  type="text"
                  size="mini" icon="el-icon-delete" @click.stop="handleDelete(data,node.level)">
              <el-button type="text" size="mini" icon="el-icon-delete" @click.stop="handleDelete(data,node.level)">
                </el-button>
              </el-col>
                        </el-row>
@@ -308,7 +299,7 @@
        <el-col class="search_thing" :span="24">
          <div class="search_label"><span class="required-span">* </span>仓库名称：</div>
          <div class="search_input">
            <el-input v-model="value" size="small"></el-input>
            <el-input v-model="value" size="small" @keyup.enter.native="confirmWarehouse"></el-input>
          </div>
        </el-col>
      </el-row>
@@ -358,8 +349,12 @@
        },
        data() {
            return {
                entity: {},
        statusList:[],
        entity: {
          warehouseId: null,
          shelfId: null
        },
        warehouse: [],
        shelf: [],
        storageVisible:false,
        exportVisible:false,
        keepVisible:false,
@@ -371,11 +366,9 @@
        upLoadWarehouse:false,
        upLoadShelves:false,
        tableList:[
          [
            {
          [{
              title:'1-1-4',
              list:[
                {
              list: [{
                  name:'原材料',
                  specs:'规格1',
                  num:20,
@@ -391,8 +384,7 @@
            },
            {
              title:'1-2-4',
              list:[
                {
              list: [{
                  name:'原材料',
                  specs:'规格1',
                  num:20,
@@ -408,8 +400,7 @@
            },
            {
              title:'1-3-4',
              list:[
                {
              list: [{
                  name:'原材料',
                  specs:'规格1',
                  num:20,
@@ -425,8 +416,7 @@
            },
            {
              title:'1-4-4',
              list:[
                {
              list: [{
                  name:'原材料',
                  specs:'规格1',
                  num:20,
@@ -442,8 +432,7 @@
            },
            {
              title:'1-5-4',
              list:[
                {
              list: [{
                  name:'原材料',
                  specs:'规格1',
                  num:20,
@@ -459,8 +448,7 @@
            },
            {
              title:'1-6-4',
              list:[
                {
              list: [{
                  name:'原材料',
                  specs:'规格1',
                  num:20,
@@ -476,8 +464,7 @@
            },
            {
              title:'1-7-4',
              list:[
                {
              list: [{
                  name:'原材料',
                  specs:'规格1',
                  num:20,
@@ -492,11 +479,9 @@
              ]
            },
          ],
          [
          {
          [{
              title:'1-1-3',
              list:[
                {
              list: [{
                  name:'原材料',
                  specs:'规格1',
                  num:20,
@@ -512,8 +497,7 @@
            },
            {
              title:'1-2-3',
              list:[
                {
              list: [{
                  name:'原材料',
                  specs:'规格1',
                  num:20,
@@ -529,8 +513,7 @@
            },
            {
              title:'1-3-3',
              list:[
                {
              list: [{
                  name:'原材料',
                  specs:'规格1',
                  num:20,
@@ -546,8 +529,7 @@
            },
            {
              title:'1-4-3',
              list:[
                {
              list: [{
                  name:'原材料',
                  specs:'规格1',
                  num:20,
@@ -563,8 +545,7 @@
            },
            {
              title:'1-5-3',
              list:[
                {
              list: [{
                  name:'原材料',
                  specs:'规格1',
                  num:20,
@@ -580,8 +561,7 @@
            },
            {
              title:'1-6-3',
              list:[
                {
              list: [{
                  name:'原材料',
                  specs:'规格1',
                  num:20,
@@ -597,8 +577,7 @@
            },
            {
              title:'1-7-3',
              list:[
                {
              list: [{
                  name:'原材料',
                  specs:'规格1',
                  num:20,
@@ -613,11 +592,9 @@
              ]
            },
          ],
          [
          {
          [{
              title:'1-1-2',
              list:[
                {
              list: [{
                  name:'原材料',
                  specs:'规格1',
                  num:20,
@@ -633,8 +610,7 @@
            },
            {
              title:'1-2-2',
              list:[
                {
              list: [{
                  name:'原材料',
                  specs:'规格1',
                  num:20,
@@ -650,8 +626,7 @@
            },
            {
              title:'1-3-2',
              list:[
                {
              list: [{
                  name:'原材料',
                  specs:'规格1',
                  num:20,
@@ -667,8 +642,7 @@
            },
            {
              title:'1-4-2',
              list:[
                {
              list: [{
                  name:'原材料',
                  specs:'规格1',
                  num:20,
@@ -684,8 +658,7 @@
            },
            {
              title:'1-5-2',
              list:[
                {
              list: [{
                  name:'原材料',
                  specs:'规格1',
                  num:20,
@@ -701,8 +674,7 @@
            },
            {
              title:'1-6-2',
              list:[
                {
              list: [{
                  name:'原材料',
                  specs:'规格1',
                  num:20,
@@ -718,8 +690,7 @@
            },
            {
              title:'1-7-2',
              list:[
                {
              list: [{
                  name:'原材料',
                  specs:'规格1',
                  num:20,
@@ -734,11 +705,9 @@
              ]
            },
          ],
          [
          {
          [{
              title:'1-1-1',
              list:[
                {
              list: [{
                  name:'原材料',
                  specs:'规格1',
                  num:20,
@@ -754,8 +723,7 @@
            },
            {
              title:'1-2-1',
              list:[
                {
              list: [{
                  name:'原材料',
                  specs:'规格1',
                  num:20,
@@ -771,8 +739,7 @@
            },
            {
              title:'1-3-1',
              list:[
                {
              list: [{
                  name:'原材料',
                  specs:'规格1',
                  num:20,
@@ -788,8 +755,7 @@
            },
            {
              title:'1-4-1',
              list:[
                {
              list: [{
                  name:'原材料',
                  specs:'规格1',
                  num:20,
@@ -805,8 +771,7 @@
            },
            {
              title:'1-5-1',
              list:[
                {
              list: [{
                  name:'原材料',
                  specs:'规格1',
                  num:20,
@@ -822,8 +787,7 @@
            },
            {
              title:'1-6-1',
              list:[
                {
              list: [{
                  name:'原材料',
                  specs:'规格1',
                  num:20,
@@ -839,8 +803,7 @@
            },
            {
              title:'1-7-1',
              list:[
                {
              list: [{
                  name:'原材料',
                  specs:'规格1',
                  num:20,
@@ -866,30 +829,22 @@
          '7列',
        ],
        value:'',
        list:[
          {
        list: [{
            code:1,
            label:'父级',
            children:[
              {
          children: [{
                code:1,
                label:'子级1',
                children:[
                  {
            children: [{
                    code:1,
                    label:'子级2',
                    children:[
                      {
              children: [{
                        code:1,
                        label:'子级3',
                      }
                    ]
                  }
                ]
              }
            ]
          }
        ],
              }]
            }]
          }]
        }],
        selectTree: null,
        expandedKeys: [],
        isEdit:false,//弹框--是否是修改,默认为false
@@ -897,8 +852,14 @@
            }
        },
        mounted() {
      this.selectList()
        },
        methods: {
      selectList() {
        this.$axios.get(this.$api.warehouse.selectWarehouse).then(res => {
          this.warehouse = res.data
        })
      },
      selectStandardTreeList() {
                this.$axios.get(this.$api.standardTree.selectStandardTreeList).then(res => {
                    this.list = res.data
@@ -910,7 +871,7 @@
                })
            },
            refreshTable() {
                this.$refs['ValueTable'].selectList()
        this.selectList()
            },
            refresh() {
                this.entity = this.HaveJson(this.entity)
@@ -950,6 +911,18 @@
          return
        }
        this.upLoadWarehouse = true;
        this.$axios.post(this.$api.warehouse.addWarehouse, {
          name: this.value
        }).then(res => {
          this.upLoadWarehouse = false;
          this.warehouseVisible = false
          if (res.code == 201) {
            this.$message.error('添加失败')
            return
          }
          this.$message.success('添加成功')
          this.selectList()
        })
      },
      // 添加货架
      confirmShelves(){
@@ -1017,6 +990,12 @@
      // 查看详情
      handelDetail(row){
        this.isDetail = true;
      },
      warehouseChange(val) {
        let map = this.warehouse.find(a => {
          return a.id === val ? a : null
        })
        this.shelf = map.warehouseShelfList
      }
        }
    }

 static/js/menu.js

@@ -38,7 +38,7 @@
            v: "样品管理",
            i: "font icon-erjidaohang",
            u: "b1-sample",
            p: ""
            p: "selectWarehouse"
        }]
    },
    {