修改

src/api/classifyManage/index.js

@@ -26,6 +26,15 @@ export async function getTreeByPid(parentId) {
   return Promise.reject(new Error(res.data.message));
 }
 
+// 查询所有物品分类
+export async function allCategoryLevel() {
+  const res = await request.get(`/main/categoryLevel/allCategoryLevel`);
+  if (res.data.code == 0) {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
 // 根据type查分类树组
 export async function getTreeByGroup(data) {
   const res = await request.get(`/main/categoryLevel/getProduceTreeByPid`, {

src/views/warehouseManagement/outgoingManagement/add.vue

@@ -228,12 +228,17 @@
           </el-col>
         </el-row>
       </el-form>
-
+      <div>
+        <el-button
+          style="margin-bottom: 20px; float: right; margin-right: 20px"
+          type="primary"
+          @click="addStock"
+          >添加</el-button
+        >
+      </div>
       <div class="material">
-        <header-title title="物品清单">
-          <el-button type="primary" @click="addStock">添加</el-button>
-        </header-title>
         <div v-if="dimension != 4">
+          <header-title title="物品清单"></header-title>
           <div class="mt10 form-table">
             <el-form
               ref="warehousingMaterialListRef"
@@ -416,7 +421,11 @@
                   label="计量单位"
                   prop="measuringUnit"
                 ></el-table-column>
-                <el-table-column label="物料代号" prop="materielCode">
+                <el-table-column
+                  label="物料代号"
+                  prop="materielCode"
+                  width="130"
+                >
                 </el-table-column>
                 <el-table-column
                   label="客户代号"
@@ -1070,7 +1079,7 @@
         // 从 this.batchDetailsVOList 中删除满足条件的对象
         this.removeItemsFromArray(
           this.batchDetailsVOList,
-          (item) => item.code.substr(0, 12) === row.code
+          (item) => item.code.substr(0, 8) === row.code
         );
 
         // 从 this.materialCodeReqList 中删除满足条件的对象

src/views/warehouseManagement/outgoingManagement/components/batchDetail.vue

@@ -34,7 +34,11 @@
         prop="availableCountBase"
       ></el-table-column>
       <el-table-column label="计量单位" prop="measuringUnit"></el-table-column>
-      <el-table-column label="物料代号" prop="materielCode"></el-table-column>
+      <el-table-column
+        label="物料代号"
+        prop="materielCode"
+        width="130"
+      ></el-table-column>
       <el-table-column label="客户代号" prop="clientCode"></el-table-column>
       <el-table-column label="重量" prop="weight"></el-table-column>
       <el-table-column label="重量单位" prop="weightUnit"></el-table-column>

src/views/warehouseManagement/outgoingManagement/details.vue

@@ -26,11 +26,12 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="出库物品类型">
-                  <span>{{
+                  <!-- <span>{{
                     infoData.bizType == 3
                       ? '物品'
                       : getDictValue('类型用途', infoData.assetType)
-                  }}</span>
+                  }}</span> -->
+                  <span>{{ handleAssetType(infoData.assetType) }}</span>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -256,20 +257,12 @@
               prop="measuringUnit"
             ></el-table-column>
             <!-- <el-table-column label="领料部门" prop=""></el-table-column> -->
-            <el-table-column
-              v-if="infoData.bizType == 2 || infoData.bizType == 1"
-              label="物料代号"
-              prop="materielCode"
-            >
+            <el-table-column label="物料代号" prop="materielCode">
               <template slot-scope="{ row }">
                 {{ row.materielCode }}
               </template>
             </el-table-column>
-            <el-table-column
-              v-if="infoData.bizType == 2 || infoData.bizType == 1"
-              label="客户代号"
-              prop="clientCode"
-            >
+            <el-table-column label="客户代号" prop="clientCode">
               <template slot-scope="{ row }">
                 {{ row.clientCode }}
               </template>
@@ -356,7 +349,7 @@
             </el-table-column>
             <el-table-column label="计量单位" prop="measuringUnit">
             </el-table-column>
-            <el-table-column label="物料代号" prop="meterielCode">
+            <el-table-column label="物料代号" prop="materielCode">
             </el-table-column>
             <el-table-column label="客户代号" prop="clientCode">
             </el-table-column>
@@ -379,7 +372,7 @@
   import { mapGetters, mapActions } from 'vuex';
   import outin from '@/api/warehouseManagement/outin';
   import warehouseDefinition from '@/api/warehouseManagement/warehouseDefinition';
-
+  import { allCategoryLevel } from '@/api/classifyManage';
   import {
     materialType,
     warehousingType,
@@ -394,6 +387,7 @@
     components: { StatusStep },
     data() {
       return {
+        codeList: [],
         metaList: [],
         infoData: {},
         warehousingMaterialList: [],
@@ -458,12 +452,23 @@
       }
     },
 
-    created() {
+    async created() {
+      await this.getCodeList();
       this.getUser();
       this._getInfo();
       this.requestDict('类型用途');
     },
     methods: {
+      async getCodeList() {
+        const { data } = await allCategoryLevel();
+        this.codeList = data.map((item) => {
+          return { dictCode: item.id, dictValue: item.name };
+        });
+      },
+      handleAssetType(r) {
+        const code = this.codeList.find((item) => item.dictCode == r);
+        return code?.dictValue;
+      },
       getUserName(id) {
         let obj = this.fromUserList.find((x) => x.id == id);
         return obj && obj.name;

src/views/warehouseManagement/stockLedger/components/item-list.vue

@@ -569,7 +569,7 @@
                 showOverflowTooltip: true
               },
               {
-                prop: 'meterielCode',
+                prop: 'materielCode',
                 label: '物料代号',
                 showOverflowTooltip: true
               },

src/views/warehouseManagement/stockManagement/add.vue

@@ -861,11 +861,7 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
-            <el-table-column
-              v-if="formData.bizType == 2 || formData.bizType == 1"
-              label="物料代号"
-              prop="materielCode"
-            >
+            <el-table-column label="物料代号" prop="materielCode" width="130">
               <template slot-scope="{ row }">
                 <el-input
                   v-if="!row.isPack"
@@ -874,11 +870,7 @@
                 <span v-else>{{ row.materielCode }}</span>
               </template>
             </el-table-column>
-            <el-table-column
-              v-if="formData.bizType == 2 || formData.bizType == 1"
-              label="客户代号"
-              prop="clientCode"
-            >
+            <el-table-column label="客户代号" prop="clientCode">
               <template slot-scope="{ row }">
                 <el-input
                   v-if="!row.isPack"
@@ -887,22 +879,13 @@
                 <span v-else> {{ row.clientCode }}</span>
               </template>
             </el-table-column>
-            <el-table-column
-              v-if="formData.bizType == 1"
-              label="刻码"
-              prop="engrave"
-            >
+            <el-table-column label="刻码" prop="engrave">
               <template slot-scope="{ row }">
                 <el-input v-if="!row.isPack" v-model="row.engrave"></el-input>
                 <span v-else>{{ row.engrave }}</span>
               </template>
             </el-table-column>
-            <el-table-column
-              v-if="formData.bizType == 2 || formData.bizType == 1"
-              label="重量"
-              prop="weight"
-              width="100"
-            >
+            <el-table-column label="重量" prop="weight" width="100">
               <template slot-scope="{ row }">
                 <el-input
                   v-if="!row.isPack"
@@ -1060,7 +1043,7 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
-            <el-table-column label="物料代号" prop="materielCode">
+            <el-table-column label="物料代号" prop="materielCode" width="130">
               <template slot-scope="{ row }">
                 <el-input
                   v-if="!row.isPack"

src/views/warehouseManagement/stockManagement/details.vue

@@ -347,20 +347,12 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
-            <el-table-column
-              v-if="infoData.bizType == 2 || infoData.bizType == 1"
-              label="物料代号"
-              prop="materielCode"
-            >
+            <el-table-column label="物料代号" prop="materielCode">
               <template slot-scope="{ row }">
                 {{ row.materielCode }}
               </template>
             </el-table-column>
-            <el-table-column
-              v-if="infoData.bizType == 2 || infoData.bizType == 1"
-              label="客户代号"
-              prop="clientCode"
-            >
+            <el-table-column label="客户代号" prop="clientCode">
               <template slot-scope="{ row }">
                 {{ row.clientCode }}
               </template>
@@ -451,20 +443,12 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
-            <el-table-column
-              v-if="infoData.bizType == 2"
-              label="物料代号"
-              prop="materielCode"
-            >
+            <el-table-column label="物料代号" prop="materielCode">
               <template slot-scope="{ row }">
                 {{ row.materielCode }}
               </template>
             </el-table-column>
-            <el-table-column
-              v-if="infoData.bizType == 2 || infoData.bizType == 1"
-              label="客户代号"
-              prop="clientCode"
-            >
+            <el-table-column label="客户代号" prop="clientCode">
               <template slot-scope="{ row }">
                 {{ row.clientCode }}
               </template>
@@ -516,7 +500,7 @@
   import StatusStep from '@/components/StatusStep/common.vue';
   // import { fileSystemDownload } from '@/utils';
   import outin from '@/api/warehouseManagement/outin';
-  import { getTreeByPid } from '@/api/classifyManage';
+  import { getTreeByPid, allCategoryLevel } from '@/api/classifyManage';
 
   import {
     materialType,
@@ -678,7 +662,8 @@
           });
           this.metailList = iArr;
         }
-        const { data } = await getTreeByPid(0);
+        // const { data } = await getTreeByPid(0);
+        const { data } = await allCategoryLevel();
         this.codeList = data.map((item) => {
           return { dictCode: item.id, dictValue: item.name };
         });

vue.config.js

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