add

src/views/ledgerAssets/boat/components/baseInfo.vue

@@ -2,7 +2,7 @@
   <div class="baseinfo-container">
     <basicInfoVue ref="basicInfoRef" />
     <div class="basic-details-title border-none">
-      <span class="border-span">舟皿信息</span>
+      <span class="border-span">容器信息</span>
     </div>
     <el-descriptions title="" :column="4" size="medium" border>
       <el-descriptions-item>
@@ -28,7 +28,7 @@
     </el-descriptions>
 
     <div class="basic-details-title border-none">
-      <span class="border-span">舟皿明细</span>
+      <span class="border-span">容器明细</span>
     </div>
     <div>
       <el-tabs

src/views/ledgerAssets/material/components/baseInfo.vue

@@ -9,7 +9,7 @@
         {{ information.code }}
       </el-descriptions-item>
       <el-descriptions-item>
-        <template slot="label"> 原料名称 </template>
+        <template slot="label"> 房屋建筑物名称 </template>
         {{ information.name }}
       </el-descriptions-item>
       <el-descriptions-item>
@@ -31,7 +31,7 @@
     </el-descriptions>
 
     <div class="basic-details-title border-none">
-      <span class="border-span">原料明细</span>
+      <span class="border-span">房屋建筑物明细</span>
     </div>
     <div>
       <el-form label-width="80px" :model="searchForm" ref="formName">
@@ -75,7 +75,12 @@
       </el-form>
 
       <div class="tabbox">
-        <el-tabs v-model="activeName" type="card" @tab-click="tabClick" class="basic-tab">
+        <el-tabs
+          v-model="activeName"
+          type="card"
+          @tab-click="tabClick"
+          class="basic-tab"
+        >
           <el-tab-pane
             :label="`在用(${countInfo.useCount ? countInfo.useCount : '0'})`"
             name="inUse"
@@ -96,7 +101,7 @@
           >
           </el-tab-pane>
         </el-tabs>
-       <!-- <el-button icon="el-icon-printer" size="small" @click="handlPrint"
+        <!-- <el-button icon="el-icon-printer" size="small" @click="handlPrint"
           >打印条码</el-button
         > -->
       </div>
@@ -106,11 +111,12 @@
         :header-cell-style="{ background: '#F0F3F3', border: 'none' }"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="55" align="center"> </el-table-column>
+        <el-table-column type="selection" width="55" align="center">
+        </el-table-column>
         <el-table-column type="index" label="序号" width="100">
         </el-table-column>
         <el-table-column prop="code" label="编码"> </el-table-column>
-        <el-table-column prop="name" label="名称" > </el-table-column>
+        <el-table-column prop="name" label="名称"> </el-table-column>
         <el-table-column prop="sourceBatchNo" label="批次号"> </el-table-column>
         <el-table-column prop="bucketNum" label="包装编码"> </el-table-column>
         <el-table-column prop="minPackUnit" label="最小包装单元">
@@ -155,7 +161,7 @@
       </div>
     </div>
 
-<!--    <QrPrint
+    <!--    <QrPrint
       ref="QrPrint"
       @close="QrPrintClose"
       :config="barCodeConfig"
@@ -165,264 +171,268 @@
 </template>
 
 <script>
-// import { getDetails } from '@/api/stockManagement/itemInformation'
-// import { getAssetPage, getCount } from '@/api/ledgerAssets/asset'
-// import { batchBarPrint } from '@/api/ledgerAssets/booksList'
-// import QrPrint from '@/components/print/printPDF.vue'
-  import { getPageSingle , getCount } from '@/api/ledgerAssets';
-  import {  getDetails } from '@/api/classifyManage/itemInformation.js';
-export default {
-  props: {
-     rowId:{
-       type:String ,
-       default:''
-     },
-  },
-  // components: { QrPrint },
-  data () {
-    return {
-      information: {},
-      activeName: 'inUse',
-      tableData: [],
-      pagination: {
-        pageNum: 1,
-        size: 15
-      },
-      total: 0,
-      searchForm: {
-        categoryId:this.rowId,
-        positionType:2
-      },
-      multipleSelection: [],
-      openWindows: false, //打印弹窗
-      barCodeConfig: [],
-      positionType: 1,
-      countInfo: {}
-    }
-  },
-  watch: {},
-  created () {
-    this.getDetilInfo()
-    this.handleList()
-    this.getCountNum()
-  },
-  methods: {
-    getDetilInfo(){
-      getDetails(this.rowId).then(res=>{
-         this.information = res.category
-      })
-    },
-
-    tabClick (val) {
-      switch (this.activeName) {
-        case 'inUse': {
-          this.positionType = 2
-          break
-        }
-        case 'inLibrary': {
-          this.positionType = 1
-          break
-        }
-        case 'hasConsume': {
-          this.positionType = 3
-          break
-        }
-        default:
-          break
+  // import { getDetails } from '@/api/stockManagement/itemInformation'
+  // import { getAssetPage, getCount } from '@/api/ledgerAssets/asset'
+  // import { batchBarPrint } from '@/api/ledgerAssets/booksList'
+  // import QrPrint from '@/components/print/printPDF.vue'
+  import { getPageSingle, getCount } from '@/api/ledgerAssets';
+  import { getDetails } from '@/api/classifyManage/itemInformation.js';
+  export default {
+    props: {
+      rowId: {
+        type: String,
+        default: ''
       }
-      this.searchForm.positionType = this.positionType
-      this.handleList()
     },
-
-    handleCurrent (page) {
-      this.pagination.page = page
-      this.handleList()
-    },
-    handleSize (size) {
-      this.pagination.pageNum = 1
-      this.pagination.size = size
-      this.handleList()
+    // components: { QrPrint },
+    data() {
+      return {
+        information: {},
+        activeName: 'inUse',
+        tableData: [],
+        pagination: {
+          pageNum: 1,
+          size: 15
+        },
+        total: 0,
+        searchForm: {
+          categoryId: this.rowId,
+          positionType: 2
+        },
+        multipleSelection: [],
+        openWindows: false, //打印弹窗
+        barCodeConfig: [],
+        positionType: 1,
+        countInfo: {}
+      };
     },
-
-    // 搜索
-    doSearch () {
-      this.pagination.pageNum = 1
-      this.handleList()
-    },
-    // 重置
-    reset () {
-      this.searchForm = {
-        categoryId:this.rowId,
-        positionType:1
-      }
-      this.doSearch()
+    watch: {},
+    created() {
+      this.getDetilInfo();
+      this.handleList();
+      this.getCountNum();
     },
+    methods: {
+      getDetilInfo() {
+        getDetails(this.rowId).then((res) => {
+          this.information = res.category;
+        });
+      },
 
-    async handleList () {
-      const params = {
-        ...this.searchForm,
-        ...this.pagination
-      }
-      const res = await getPageSingle(params)
-      if (res) {
-        this.tableData = res.list
-        this.total = res.count
-      }
-    },
+      tabClick(val) {
+        switch (this.activeName) {
+          case 'inUse': {
+            this.positionType = 2;
+            break;
+          }
+          case 'inLibrary': {
+            this.positionType = 1;
+            break;
+          }
+          case 'hasConsume': {
+            this.positionType = 3;
+            break;
+          }
+          default:
+            break;
+        }
+        this.searchForm.positionType = this.positionType;
+        this.handleList();
+      },
 
-    handleSelectionChange (val) {
-      this.multipleSelection = val
-    },
+      handleCurrent(page) {
+        this.pagination.page = page;
+        this.handleList();
+      },
+      handleSize(size) {
+        this.pagination.pageNum = 1;
+        this.pagination.size = size;
+        this.handleList();
+      },
 
-    QrPrintClose () {
-      this.barCodeConfig = []
-    },
+      // 搜索
+      doSearch() {
+        this.pagination.pageNum = 1;
+        this.handleList();
+      },
+      // 重置
+      reset() {
+        this.searchForm = {
+          categoryId: this.rowId,
+          positionType: 1
+        };
+        this.doSearch();
+      },
 
-    async handlPrint () {
-      this.openWindows = true
-      const barType = 4
-      let params = this.multipleSelection.map(item => {
-        return {
-          barType: barType,
-          bizId: item.id
+      async handleList() {
+        const params = {
+          ...this.searchForm,
+          ...this.pagination
+        };
+        const res = await getPageSingle(params);
+        if (res) {
+          this.tableData = res.list;
+          this.total = res.count;
         }
-      })
-      let _this = this
-      const res = await batchBarPrint(params)
-      async function getResList () {
-        for (const el of res.data) {
-          const fontTypeObj = { 1: '宋体', 2: '微软雅黑', 3: 'Arial' }
-          let item = el
-          item.useModeList = item.useModeList.sort((a, b) => {
-            return a.barAvg.substr(4) - b.barAvg.substr(4)
-          })
-          const useModeList = item.useModeList
-          // 条码框数据
-          _this.barCodeConfig.push({
-            putType: el.putType,
-            qrCode: el.qrCode,
-            sizeLong: el.sizeLong,
-            sizeWide: el.sizeWide,
-            code1: useModeList[0].sampleData,
-            code2: useModeList[1].sampleData,
-            code3: useModeList[2].sampleData,
-            code4: useModeList[3].sampleData,
-            code5: useModeList[4].sampleData,
-            code6: useModeList[5].sampleData,
-            code7: useModeList[6].sampleData,
-            code8: useModeList[7].sampleData,
-            code9: useModeList[8].sampleData,
-            code10: useModeList[9].sampleData,
-            code11: useModeList[10].sampleData,
-            code12: useModeList[11].sampleData,
-            code13: useModeList[12].sampleData,
-            code14: useModeList[13].sampleData,
-            fontSizeCode1: useModeList[0].fontSize,
-            fontSizeCode2: useModeList[1].fontSize,
-            fontSizeCode3: useModeList[2].fontSize,
-            fontSizeCode4: useModeList[3].fontSize,
-            fontSizeCode5: useModeList[4].fontSize,
-            fontSizeCode6: useModeList[5].fontSize,
-            fontSizeCode7: useModeList[6].fontSize,
-            fontSizeCode8: useModeList[7].fontSize,
-            fontSizeCode9: useModeList[8].fontSize,
-            fontSizeCode10: useModeList[9].fontSize,
-            fontSizeCode11: useModeList[10].fontSize,
-            fontSizeCode12: useModeList[11].fontSize,
-            fontSizeCode13: useModeList[12].fontSize,
-            fontSizeCode14: useModeList[13].fontSize,
-            typefaceCode1: fontTypeObj[useModeList[0].fontType],
-            typefaceCode2: fontTypeObj[useModeList[1].fontType],
-            typefaceCode3: fontTypeObj[useModeList[2].fontType],
-            typefaceCode4: fontTypeObj[useModeList[3].fontType],
-            typefaceCode5: fontTypeObj[useModeList[4].fontType],
-            typefaceCode6: fontTypeObj[useModeList[5].fontType],
-            typefaceCode7: fontTypeObj[useModeList[6].fontType],
-            typefaceCode8: fontTypeObj[useModeList[7].fontType],
-            typefaceCode9: fontTypeObj[useModeList[8].fontType],
-            typefaceCode10: fontTypeObj[useModeList[9].fontType],
-            typefaceCode11: fontTypeObj[useModeList[10].fontType],
-            typefaceCode12: fontTypeObj[useModeList[11].fontType],
-            typefaceCode13: fontTypeObj[useModeList[12].fontType],
-            typefaceCode14: fontTypeObj[useModeList[13].fontType]
-          })
+      },
+
+      handleSelectionChange(val) {
+        this.multipleSelection = val;
+      },
+
+      QrPrintClose() {
+        this.barCodeConfig = [];
+      },
+
+      async handlPrint() {
+        this.openWindows = true;
+        const barType = 4;
+        let params = this.multipleSelection.map((item) => {
+          return {
+            barType: barType,
+            bizId: item.id
+          };
+        });
+        let _this = this;
+        const res = await batchBarPrint(params);
+        async function getResList() {
+          for (const el of res.data) {
+            const fontTypeObj = { 1: '宋体', 2: '微软雅黑', 3: 'Arial' };
+            let item = el;
+            item.useModeList = item.useModeList.sort((a, b) => {
+              return a.barAvg.substr(4) - b.barAvg.substr(4);
+            });
+            const useModeList = item.useModeList;
+            // 条码框数据
+            _this.barCodeConfig.push({
+              putType: el.putType,
+              qrCode: el.qrCode,
+              sizeLong: el.sizeLong,
+              sizeWide: el.sizeWide,
+              code1: useModeList[0].sampleData,
+              code2: useModeList[1].sampleData,
+              code3: useModeList[2].sampleData,
+              code4: useModeList[3].sampleData,
+              code5: useModeList[4].sampleData,
+              code6: useModeList[5].sampleData,
+              code7: useModeList[6].sampleData,
+              code8: useModeList[7].sampleData,
+              code9: useModeList[8].sampleData,
+              code10: useModeList[9].sampleData,
+              code11: useModeList[10].sampleData,
+              code12: useModeList[11].sampleData,
+              code13: useModeList[12].sampleData,
+              code14: useModeList[13].sampleData,
+              fontSizeCode1: useModeList[0].fontSize,
+              fontSizeCode2: useModeList[1].fontSize,
+              fontSizeCode3: useModeList[2].fontSize,
+              fontSizeCode4: useModeList[3].fontSize,
+              fontSizeCode5: useModeList[4].fontSize,
+              fontSizeCode6: useModeList[5].fontSize,
+              fontSizeCode7: useModeList[6].fontSize,
+              fontSizeCode8: useModeList[7].fontSize,
+              fontSizeCode9: useModeList[8].fontSize,
+              fontSizeCode10: useModeList[9].fontSize,
+              fontSizeCode11: useModeList[10].fontSize,
+              fontSizeCode12: useModeList[11].fontSize,
+              fontSizeCode13: useModeList[12].fontSize,
+              fontSizeCode14: useModeList[13].fontSize,
+              typefaceCode1: fontTypeObj[useModeList[0].fontType],
+              typefaceCode2: fontTypeObj[useModeList[1].fontType],
+              typefaceCode3: fontTypeObj[useModeList[2].fontType],
+              typefaceCode4: fontTypeObj[useModeList[3].fontType],
+              typefaceCode5: fontTypeObj[useModeList[4].fontType],
+              typefaceCode6: fontTypeObj[useModeList[5].fontType],
+              typefaceCode7: fontTypeObj[useModeList[6].fontType],
+              typefaceCode8: fontTypeObj[useModeList[7].fontType],
+              typefaceCode9: fontTypeObj[useModeList[8].fontType],
+              typefaceCode10: fontTypeObj[useModeList[9].fontType],
+              typefaceCode11: fontTypeObj[useModeList[10].fontType],
+              typefaceCode12: fontTypeObj[useModeList[11].fontType],
+              typefaceCode13: fontTypeObj[useModeList[12].fontType],
+              typefaceCode14: fontTypeObj[useModeList[13].fontType]
+            });
+          }
         }
-      }
-      getResList()
-    },
+        getResList();
+      },
 
-    getCountNum () {
-      const params = {
-        categoryId:  this.rowId,
-        sourceBizNo: this.searchForm.sourceBizNo?this.searchForm.sourceBizNo:'',
-        sourceBatchNo: this.searchForm.sourceBatchNo?this.searchForm.sourceBatchNo:''
+      getCountNum() {
+        const params = {
+          categoryId: this.rowId,
+          sourceBizNo: this.searchForm.sourceBizNo
+            ? this.searchForm.sourceBizNo
+            : '',
+          sourceBatchNo: this.searchForm.sourceBatchNo
+            ? this.searchForm.sourceBatchNo
+            : ''
+        };
+        getCount(params).then((res) => {
+          this.countInfo = res;
+        });
       }
-      getCount(params).then(res => {
-          this.countInfo = res
-      })
     }
-  }
-}
+  };
 </script>
 
 <style lang="scss" scoped>
-.baseinfo-container {
-  background-color: #fff;
-  padding:0 20px 20px;
-  .tabbox {
-    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-  }
-  .content {
-    padding: 0 20px;
-  }
-  .basic-details-title{
-    font-size: 16px;
-    margin: 15px 0;
-  }
-  .basic-tab{
-    margin-bottom: 15px;
-  }
-  .upload-container {
-    display: flex;
-    .img-box {
-      width: 280px;
-      height: 342px;
-      border: 1px solid rgba(215, 215, 215, 1);
+  .baseinfo-container {
+    background-color: #fff;
+    padding: 0 20px 20px;
+    .tabbox {
+      width: 100%;
       display: flex;
-      justify-content: center;
       align-items: center;
-      img {
-        max-width: 100%;
-      }
+      justify-content: space-between;
     }
-    .file-list {
-      margin-left: 50px;
-      flex: 1;
+    .content {
+      padding: 0 20px;
+    }
+    .basic-details-title {
+      font-size: 16px;
+      margin: 15px 0;
+    }
+    .basic-tab {
+      margin-bottom: 15px;
+    }
+    .upload-container {
       display: flex;
-      justify-content: space-between;
-      flex-wrap: wrap;
-      justify-items: baseline;
-      align-content: flex-start;
-      .file-box {
-        width: 30%;
-        margin-bottom: 20px;
-        height: 57px;
-        text-align: center;
-        line-height: 55px;
-        border: 1px solid var(--mainColor);
-        color: var(--mainColor);
-        cursor: pointer;
+      .img-box {
+        width: 280px;
+        height: 342px;
+        border: 1px solid rgba(215, 215, 215, 1);
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        img {
+          max-width: 100%;
+        }
+      }
+      .file-list {
+        margin-left: 50px;
+        flex: 1;
+        display: flex;
+        justify-content: space-between;
+        flex-wrap: wrap;
+        justify-items: baseline;
+        align-content: flex-start;
+        .file-box {
+          width: 30%;
+          margin-bottom: 20px;
+          height: 57px;
+          text-align: center;
+          line-height: 55px;
+          border: 1px solid var(--mainColor);
+          color: var(--mainColor);
+          cursor: pointer;
 
-        &.disabled {
-          cursor: not-allowed;
-          border-color: rgba(215, 215, 215, 1);
-          color: rgba(215, 215, 215, 1);
+          &.disabled {
+            cursor: not-allowed;
+            border-color: rgba(215, 215, 215, 1);
+            color: rgba(215, 215, 215, 1);
+          }
         }
       }
     }
   }
-}
 </style>

src/views/ledgerAssets/material/detail.vue

@@ -1,54 +1,50 @@
 <template>
   <div class="ele-body">
     <el-card :body-style="{ padding: 0 }">
-       <div class="page-title">
-         <el-page-header @back="$router.go(-1)">
-           <div slot="content" class="pageContent">
-             <div>原料信息详情</div>
-           </div>
-         </el-page-header>
-       </div>
-       <div class="content-wrapper">
-         <component :is="activeComp" :rowId="rowId"></component>
-       </div>
+      <div class="page-title">
+        <el-page-header @back="$router.go(-1)">
+          <div slot="content" class="pageContent">
+            <div>房屋建筑物信息详情</div>
+          </div>
+        </el-page-header>
+      </div>
+      <div class="content-wrapper">
+        <component :is="activeComp" :rowId="rowId"></component>
+      </div>
     </el-card>
   </div>
 </template>
 
 <script>
-import baseInfo from './components/baseInfo.vue'
-export default {
-  components: {
-    baseInfo
-  },
-  data () {
-    return {
-      activeComp: 'baseInfo',
-      tabOptions: [
-        { key: 'baseInfo', name: '舟皿信息' },
-      ],
-      rowId:null,
+  import baseInfo from './components/baseInfo.vue';
+  export default {
+    components: {
+      baseInfo
+    },
+    data() {
+      return {
+        activeComp: 'baseInfo',
+        tabOptions: [{ key: 'baseInfo', name: '舟皿信息' }],
+        rowId: null
+      };
+    },
+    created() {
+      this.rowId = this.$route.query.id;
+    },
+    methods: {
+      // async getDetilInfo(id){
+      //   const res = await getDetails({id:id})
+      //   if (res.success){
+      //   }
+      // },
     }
-  },
-  created () {
-     this.rowId = this.$route.query.id
-  },
-  methods:{
-     // async getDetilInfo(id){
-     //   const res = await getDetails({id:id})
-     //   if (res.success){
-
-     //   }
-     // },
-  }
-
-}
+  };
 </script>
 
 <style lang="scss" scoped>
-   .page-title{
-     background: #fff;
-     padding:26px 10px 15px;
-     border-bottom:1px solid #eaeefb;
-   }
+  .page-title {
+    background: #fff;
+    padding: 26px 10px 15px;
+    border-bottom: 1px solid #eaeefb;
+  }
 </style>

src/views/ledgerAssets/material/index.vue

@@ -11,7 +11,7 @@
             <AssetTree
               @handleNodeClick="handleNodeClick"
               @setRootId="setRootId"
-              id="1"
+              id="18"
               ref="treeList"
             />
           </div>
@@ -37,7 +37,7 @@
       AssetTree,
       MaterialList
     },
-    data () {
+    data() {
       return {
         // 加载状态
         loading: false,
@@ -49,11 +49,11 @@
     },
     computed: {},
     methods: {
-      handleNodeClick (info) {
+      handleNodeClick(info) {
         this.current = info;
       },
       // 获取根节点id
-      setRootId (id) {
+      setRootId(id) {
         this.rootId = id;
       }
     }

vue.config.js

@@ -32,10 +32,11 @@ module.exports = {
       // 当我们的本地的请求 有/api的时候，就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
         // target: 'http://192.168.3.51:18086', // 测试环境
-        target: 'http://124.71.68.31:50001',
+        // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.139:18086', // 粟
         // target: 'http://192.168.1.132:18086', // 徐1
         // target: 'http://192.168.1.134:18086', //徐2
+        target: 'http://124.71.21.222:50001',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''