add

src/views/warehouseManagement/stockManagement/add.vue

@@ -35,7 +35,7 @@
           </el-col> -->
           <el-col :span="8">
             <el-form-item label="物品类型" prop="extInfo.assetType">
-              <DictSelection
+              <!-- <DictSelection
                 dictName="类型用途"
                 :disabled="
                   !!(warehousingMaterialList && warehousingMaterialList.length)
@@ -43,7 +43,22 @@
                 clearable
                 v-model="formData.extInfo.assetType"
                 @itemChange="handleChange"
-              />
+              /> -->
+              <el-select
+                :disabled="
+                  !!(warehousingMaterialList && warehousingMaterialList.length)
+                "
+                clearable
+                v-model="formData.extInfo.assetType"
+                @change="handleChanges"
+              >
+                <el-option
+                  v-for="(item, index) in codeList"
+                  :key="index"
+                  :label="item.dictValue"
+                  :value="item.dictCode"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -330,7 +345,7 @@
                       "
                     >
                       <template slot="append">
-                        {{ row.minPackUnit }}个
+                        {{ row.minPackUnit }}
                       </template>
                     </el-input>
                   </el-form-item>
@@ -627,7 +642,7 @@
 
 <script>
   import outin from '@/api/warehouseManagement/outin';
-
+  import { getTreeByPid } from '@/api/classifyManage';
   import warehouseDefinition from '@/api/warehouseManagement/warehouseDefinition';
   import selectUpload from '@/components/selectUpload';
   import upload from '@/components/uploadImg';
@@ -658,6 +673,7 @@
     },
     data() {
       return {
+        codeList: [],
         materialType,
         warehousingType,
         sceneState,
@@ -1273,6 +1289,10 @@
         console.log('sasasa===', this.warehousingMaterialList);
       },
       async initData() {
+        const { data } = await getTreeByPid(0);
+        this.codeList = data.map((item) => {
+          return { dictCode: item.id, dictValue: item.name };
+        });
         const res = await warehouseDefinition.tree();
         this.treeList = this.$util.toTreeData({
           data: res,
@@ -1314,6 +1334,11 @@
         this.title = data?.dictValue;
         this.selectEquiType = data?.dictCode;
       },
+      handleChanges(code) {
+        const data = this.codeList.find((item) => item.dictCode == code);
+        this.title = data?.dictValue;
+        this.selectEquiType = data?.dictCode;
+      },
       getSupplier() {
         return new Promise((resolve, reject) => {
           supplier.list({ page: 1, size: 999 }).then((res) => {

src/views/warehouseManagement/stockManagement/details.vue

@@ -2,10 +2,10 @@
   <div class="ele-body">
     <el-card shadow="never">
       <div class="page-title">
-        <!-- <PageHeader title="入库单详情"> </PageHeader> -->
+        <PageHeader title="入库单详情"> </PageHeader>
       </div>
       <div>
-        <StatusStep :activeCode="infoData.verifyStatus" />
+        <!-- <StatusStep :activeCode="infoData.verifyStatus" /> -->
         <div class="stepsStatus">
           <el-steps :active="active" align-center>
             <el-step title="创建"></el-step>
@@ -306,7 +306,7 @@
 
 <script>
   // import { getInfo } from '@/api/stockManagement';
-  // import PageHeader from '@/components/PageHeader';
+  import PageHeader from '@/components/PageHeader';
   import StatusStep from '@/components/StatusStep/common.vue';
   // import { fileSystemDownload } from '@/utils';
   import outin from '@/api/warehouseManagement/outin';
@@ -325,7 +325,7 @@
   import { tableHeader } from '../common';
   import { mapGetters, mapActions } from 'vuex';
   export default {
-    components: { StatusStep },
+    components: { StatusStep, PageHeader },
     data() {
       return {
         auditStatus,
@@ -450,6 +450,12 @@
 </script>
 
 <style lang="scss" scoped>
+  ::v-deep .page-title {
+    border-bottom: none;
+  }
+  ::v-deep .page-title-div {
+    width: 100%;
+  }
   .stepsStatus {
     width: 40%;
     margin: 0 auto;

src/views/warehouseManagement/stockManagement/index.vue

@@ -193,7 +193,7 @@
             showOverflowTooltip: true
           },
           {
-            prop: 'extInfo.createUserName',
+            prop: 'createUserName',
             label: '登记人',
             align: 'center',
             showOverflowTooltip: true