add

src/views/warehouseManagement/stockLedger/components/details/InWarehouse.vue

@@ -113,27 +113,21 @@
       :data="tableData"
       @cell-click="handleCellClick"
       :header-cell-style="{ background: '#EEEEEE', border: 'none' }"
-      ><el-table-column width="80px" label="序号">
-        <template slot-scope="{ $index }">
-          {{ $tableIndex($index, page, size) }}
-        </template>
-      </el-table-column>
-      <el-table-column label="入库单号" prop="bizNum"></el-table-column>
+    >
+      <el-table-column width="80px" label="序号" type="index" />
+      <el-table-column label="入库单号" prop="bizNo"></el-table-column>
       <el-table-column label="入库场景" prop="bizScene">
         <template slot-scope="{ row }">{{
           getSceneState(+row.bizScene)
         }}</template>
       </el-table-column>
-      <el-table-column
-        label="入库数量"
-        prop="measurementUnit"
-      ></el-table-column>
+      <el-table-column label="入库数量" prop="countNo"></el-table-column>
       <el-table-column label="计量单位" prop="unit"></el-table-column>
-      <el-table-column label="包装数量" prop="outInNum"></el-table-column>
-      <el-table-column label="包装单位" prop="minPackUnit"></el-table-column>
-      <el-table-column label="操作人" prop="createUsername"></el-table-column>
-      <el-table-column label="审核人" prop="verifyName"></el-table-column>
-      <el-table-column label="入库时间" prop="verifyTime"></el-table-column>
+      <el-table-column label="包装数量" prop="packageNo"></el-table-column>
+      <el-table-column label="包装单位" prop="packingUnit"></el-table-column>
+      <el-table-column label="操作人" prop=""></el-table-column>
+      <el-table-column label="审核人" prop=""></el-table-column>
+      <el-table-column label="入库时间" prop="createTime"></el-table-column>
     </el-table>
     <Pagination
       :total="total"
@@ -152,10 +146,10 @@
 <script>
   import Pagination from '@/components/Pagination';
   // import { getInWarehouseDetail } from '@/api/stockManagement/stockLedger'
-  // import { sceneState } from '@/utils/dict/index'
+  import { sceneState } from '@/utils/dict/index';
   import InWarehouseDialog from './InWarehouseDialog';
   import { inventorybookPage } from '@/api/classifyManage/itemInformation';
-  // import { useDictLabel } from '@/utils/dict/index'
+  import { useDictLabel } from '@/utils/dict/index';
 
   import ouint from '@/api/warehouseManagement/outin';
   export default {
@@ -172,7 +166,7 @@
     },
     data() {
       return {
-        // sceneState,
+        sceneState,
         sceneState: [],
         searchForm: {
           bizNum: '',
@@ -191,7 +185,7 @@
       this.getList();
     },
     methods: {
-      // getSceneState: useDictLabel(sceneState),
+      getSceneState: useDictLabel(sceneState),
       search() {
         this.page = 1;
         this.getList();
@@ -211,13 +205,13 @@
           size: this.size,
           page: this.page,
           type: 1,
-          ...this.baseParams,
+          ...this.baseParams
           // ...this.searchForm,
           // batchNum: this.baseParams.batchNum || this.searchForm.batchNum
         });
-        if (res?.success) {
-          this.tableData = res.data.records;
-          this.total = res.data.total;
+        if (res) {
+          this.tableData = res.list;
+          this.total = res.count;
         }
       }
     }

src/views/warehouseManagement/stockLedger/components/details/InWarehouseDialog.vue

@@ -78,6 +78,7 @@
   // import dictMixin from '@/mixins/dictMixins'
   // import { batchBarPrint } from '@/api/ledgerAssets/booksList'
   // import QrPrint from '@/components/print/printPDF.vue'
+  import { mapGetters, mapActions } from 'vuex';
 
   // 条码类型枚举
   const codeTypeObj = {
@@ -135,7 +136,8 @@
       },
       assetTypeName() {
         return this.getDictValue('类型用途', this.baseInfo.assetType);
-      }
+      },
+      ...mapGetters(['getDictValue'])
     },
     created() {},
     methods: {

src/views/warehouseManagement/stockManagement/add.vue

@@ -1124,9 +1124,9 @@
           `warehousingMaterialList.${index}.houseList`
         ];
         if (this.formData.bizType == 1) {
-          fileds.push(...[`warehousingMaterialList.${index}.customCode`]);
+          // fileds.push(...[`warehousingMaterialList.${index}.customCode`]);
         } else if (this.formData.bizType == 2) {
-          fileds.push(...[`warehousingMaterialList.${index}.supplierCode`]);
+          // fileds.push(...[`warehousingMaterialList.${index}.supplierCode`]);
         }
         if (this.formData.bizType != 5) {
           fileds.push(
@@ -1483,7 +1483,7 @@
               }
             } catch (error) {}
             this.saveLoading = false;
-            m, this.$router.push('/warehouseManagement/stockManagement');
+            this.$router.push('/warehouseManagement/stockManagement');
           }
         });
       },
@@ -1542,6 +1542,7 @@
         // this.warehouseList = res111.list;
         const info = JSON.parse(localStorage.getItem('info'));
         let obj = res.find((item) => item.id === info.deptId);
+        if (!obj) return;
         this.formData.extInfo.deptName = obj.name;
         this.formData.extInfo.createUserName = info.name;
         this.formData.createUserId = info.id;

vue.config.js

@@ -33,7 +33,7 @@ module.exports = {
       '/api': {
         // target: 'http://192.168.3.51:18086', // 测试环境
         // target: 'http://124.71.68.31:50001',
-        target: 'http://192.168.1.117:18086', 
+        target: 'http://192.168.1.132:18086',
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {