add

src/views/ledgerAssets/boat/components/boat-list.vue

@@ -80,6 +80,12 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
+          {
+            prop: 'code1',
+            label: '编号',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             prop: 'module',
             label: '型号',

src/views/ledgerAssets/dryArea/components/dryArea-list.vue

@@ -1,13 +1,25 @@
 <template>
   <div>
-    <dryArea-search @search="reload" ref="searchRef">
-    </dryArea-search>
+    <dryArea-search @search="reload" ref="searchRef"> </dryArea-search>
     <!-- 数据表格 -->
-    <ele-pro-table ref="table" :columns="columns" :datasource="datasource" height="calc(100vh - 265px)"
-      full-height="calc(100vh - 116px)" tool-class="ele-toolbar-form" cache-key="systemOrgUserTable">
+    <ele-pro-table
+      ref="table"
+      :columns="columns"
+      :datasource="datasource"
+      height="calc(100vh - 265px)"
+      full-height="calc(100vh - 116px)"
+      tool-class="ele-toolbar-form"
+      cache-key="systemOrgUserTable"
+    >
       <!-- 表头工具栏 -->
       <template v-slot:toolbar>
-        <el-button size="small" type="primary" icon="el-icon-plus" class="ele-btn-icon" @click="openEdit()">
+        <el-button
+          size="small"
+          type="primary"
+          icon="el-icon-plus"
+          class="ele-btn-icon"
+          @click="openEdit()"
+        >
           新增
         </el-button>
       </template>
@@ -17,12 +29,20 @@
         {{ row.status == 0 ? '空闲' : row.status == 1 ? '占用' : '' }}
       </template>
 
-
       <template v-slot:action="{ row }">
-        <el-link type="primary" :underline="false" icon="el-icon-edit" @click="openEdit(row)">
+        <el-link
+          type="primary"
+          :underline="false"
+          icon="el-icon-edit"
+          @click="openEdit(row)"
+        >
           编辑
         </el-link>
-        <el-popconfirm class="ele-action" title="确定要删除此干燥区吗？" @confirm="remove(row)">
+        <el-popconfirm
+          class="ele-action"
+          title="确定要删除此干燥区吗？"
+          @confirm="remove(row)"
+        >
           <template v-slot:reference>
             <el-link type="danger" :underline="false" icon="el-icon-delete">
               删除
@@ -30,145 +50,144 @@
           </template>
         </el-popconfirm>
       </template>
-
-
     </ele-pro-table>
 
-    <user-edit :visible.sync="showEdit" :rootId="rootId" :data="current" @done="reload" ref="userEdit" />
-
+    <user-edit
+      :visible.sync="showEdit"
+      :rootId="rootId"
+      :data="current"
+      @done="reload"
+      ref="userEdit"
+    />
   </div>
 </template>
 
 <script>
-import dryAreaSearch from './dryArea-search.vue';
-import { getList, removeItem } from '@/api/ledgerAssets/dryArea';
-import dictMixins from '@/mixins/dictMixins';
-import UserEdit from './user-edit.vue';
-
-export default {
-  mixins: [dictMixins],
-  components: { dryAreaSearch, UserEdit },
-  props: {
-    // 类别id
-    categoryId: [Number, String],
-    rootId: [Number, String],
-  },
-  data() {
-    return {
-      // 当前编辑数据
-      current: null,
-      // 是否显示编辑弹窗
-      showEdit: false,
-
-
-      // 表格列配置
-      columns: [
-        {
-          columnKey: 'index',
-          type: 'index',
-          label: '序号',
-          width: 55,
-          align: 'center',
-          showOverflowTooltip: true,
-          fixed: 'left'
-        },
-        {
-          prop: 'code',
-          label: '干燥区编码',
-          showOverflowTooltip: true,
-          minWidth: 110,
-
-        },
-        {
-          prop: 'name',
-          label: '干燥区名称',
-          showOverflowTooltip: true,
-          minWidth: 110
-        },
-
-        {
-          prop: 'specification',
-          label: '规格',
-          showOverflowTooltip: true,
-          minWidth: 110
-        },
-
-
-        {
-          prop: 'region',
-          label: '位置',
-          showOverflowTooltip: true,
-          minWidth: 110
-        },
-        {
-          prop: 'status',
-          label: '状态',
-          showOverflowTooltip: true,
-          minWidth: 110,
-          slot: 'status',
-        },
-
-        {
-          label: '操作',
-          prop: 'action',
-          slot: 'action',
-          action: 'action'
-        }
-
-
-
-      ]
-    };
-  },
-  created() {
-    this.requestDict('角度');
-  },
-  methods: {
-    /* 表格数据源 */
-    datasource({ page, limit, where }) {
-      return getList({
-        ...where,
-        pageNum: page,
-        size: limit,
-        categoryLevelId: this.categoryId,
-        rootCategoryLevelId: this.rootId
-      });
+  import dryAreaSearch from './dryArea-search.vue';
+  import { getList, removeItem } from '@/api/ledgerAssets/dryArea';
+  import dictMixins from '@/mixins/dictMixins';
+  import UserEdit from './user-edit.vue';
+
+  export default {
+    mixins: [dictMixins],
+    components: { dryAreaSearch, UserEdit },
+    props: {
+      // 类别id
+      categoryId: [Number, String],
+      rootId: [Number, String]
     },
-    /* 刷新表格 */
-    reload(where) {
-      this.$refs.table.reload({ pageNum: 1, where: where });
+    data() {
+      return {
+        // 当前编辑数据
+        current: null,
+        // 是否显示编辑弹窗
+        showEdit: false,
+
+        // 表格列配置
+        columns: [
+          {
+            columnKey: 'index',
+            type: 'index',
+            label: '序号',
+            width: 55,
+            align: 'center',
+            showOverflowTooltip: true,
+            fixed: 'left'
+          },
+          {
+            prop: 'code',
+            label: '干燥区编码',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'name',
+            label: '干燥区名称',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'code1',
+            label: '编号',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'specification',
+            label: '规格',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+
+          {
+            prop: 'region',
+            label: '位置',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'status',
+            label: '状态',
+            showOverflowTooltip: true,
+            minWidth: 110,
+            slot: 'status'
+          },
+
+          {
+            label: '操作',
+            prop: 'action',
+            slot: 'action',
+            action: 'action'
+          }
+        ]
+      };
     },
-
-    /* 打开编辑弹窗 */
-    openEdit(row) {
-      this.current = row;
-      this.showEdit = true;
-      this.$refs.userEdit.$refs.form &&
-        this.$refs.userEdit.$refs.form.clearValidate();
+    created() {
+      this.requestDict('角度');
     },
-
-
-    /* 删除 */
-    remove(row) {
-      const loading = this.$loading({ lock: true });
-      removeItem([row.id])
-        .then((msg) => {
-          loading.close();
-          this.$message.success(msg);
-          this.reload();
-        })
-        .catch((e) => {
-          loading.close();
+    methods: {
+      /* 表格数据源 */
+      datasource({ page, limit, where }) {
+        return getList({
+          ...where,
+          pageNum: page,
+          size: limit,
+          categoryLevelId: this.categoryId,
+          rootCategoryLevelId: this.rootId
         });
+      },
+      /* 刷新表格 */
+      reload(where) {
+        this.$refs.table.reload({ pageNum: 1, where: where });
+      },
+
+      /* 打开编辑弹窗 */
+      openEdit(row) {
+        this.current = row;
+        this.showEdit = true;
+        this.$refs.userEdit.$refs.form &&
+          this.$refs.userEdit.$refs.form.clearValidate();
+      },
+
+      /* 删除 */
+      remove(row) {
+        const loading = this.$loading({ lock: true });
+        removeItem([row.id])
+          .then((msg) => {
+            loading.close();
+            this.$message.success(msg);
+            this.reload();
+          })
+          .catch((e) => {
+            loading.close();
+          });
+      }
+    },
+    watch: {
+      // 监听类别id变化
+      categoryId() {
+        this.reload();
+      }
     }
-
-
-  },
-  watch: {
-    // 监听类别id变化
-    categoryId() {
-      this.reload();
-    }
-  }
-};
+  };
 </script>

src/views/ledgerAssets/equipment/components/equipment-list.vue

@@ -162,7 +162,12 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
-
+          {
+            prop: 'code1',
+            label: '编号',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             prop: 'category.modelType',
             label: '型号',

src/views/ledgerAssets/equipment/edit.vue

@@ -296,6 +296,11 @@
                 <el-input class="input" v-model="zcInfo.fixCode"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="编号">
+                <el-input class="input" v-model="zcInfo.code1"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="颜色">
                 <el-input class="input" v-model="zcInfo.color"></el-input>

src/views/ledgerAssets/meter/components/data-list.vue

@@ -119,6 +119,12 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
+          {
+            prop: 'code1',
+            label: '编号',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             prop: 'fixCode',
             label: '固资编码',

src/views/ledgerAssets/meter/edit.vue

@@ -1,247 +1,278 @@
 <template>
   <div class="ele-body">
-     <el-card :body-style="{ padding: 0 }">
-         <div class="page-container equipment-container">
-           <div class="page-title basic-details-title">
-             <el-page-header @back="$router.go(-1)">
-               <div slot="content" class="pageContent">
-                 <div>编辑模具信息</div>
-               </div>
-             </el-page-header>
-             <div>
-               <el-button size="small" @click="$router.go(-1)">取消</el-button>
-               <el-button
-                 size="small"
-                 type="primary"
-                  @click="toSave"
-                 v-loading="btnLoading"
-                 >确定</el-button
-               >
-             </div>
-           </div>
-           <div class="content">
-             <el-form label-width="100px">
-               <div class="basic-details-title border-none">
-                 <span class="border-span">基本信息</span>
-               </div>
-               <el-descriptions title="" :column="4" size="medium" border>
-                 <el-descriptions-item>
-                   <template slot="label"> 模具编码 </template>
-                   {{info.code}}
-                 </el-descriptions-item>
-                 <el-descriptions-item>
-                   <template slot="label"> 模具名称 </template>
-                   {{info.name}}
-                 </el-descriptions-item>
-                 <el-descriptions-item>
-                   <template slot="label"> 牌号 </template>
-                   {{info.baseInfo.brandNum}}
-                 </el-descriptions-item>
-                 <el-descriptions-item>
-                   <template slot="label"> 型号 </template>
-                   {{info.baseInfo.modelType}}
-                 </el-descriptions-item>
-                 <el-descriptions-item>
-                   <template slot="label"> 大模体型号 </template>
-                   {{info.extraInfo.maxMoldType}}
-                 </el-descriptions-item>
-                 <el-descriptions-item>
-                   <template slot="label"> 芯杆数量 </template>
-                   {{info.extraInfo.coreBarNum}}
-                 </el-descriptions-item>
-                 <el-descriptions-item>
-                   <template slot="label"> 模孔数量 </template>
-                   {{info.extraInfo.dieHoleNum}}
-                 </el-descriptions-item>
-                 <el-descriptions-item>
-                   <template slot="label"> 收缩系数 </template>
-                   {{info.extraInfo.shrinkEffictive}}
-                 </el-descriptions-item>
-                 <el-descriptions-item>
-                   <template slot="label"> 下冲头数量 </template>
-                   {{info.extraInfo.downPunchNum}}
-                 </el-descriptions-item>
-                 <el-descriptions-item>
-                   <template slot="label"> 上冲头数量 </template>
-                   {{info.extraInfo.upperPunchNum}}
-                 </el-descriptions-item>
-                 <el-descriptions-item>
-                   <template slot="label"> 最大冲压次数 </template>
-                   {{info.extraInfo.maxCyTimes}}
-                 </el-descriptions-item>
-                 <el-descriptions-item>
-                   <template slot="label"> 计量单位 </template>
-                   {{info.baseInfo.measuringUnit}}
-                 </el-descriptions-item>
-                 <el-descriptions-item :span="2">
-                   <template slot="label"> 分类 </template>
-                   {{info.baseInfo.categoryLevelPath}}
-                 </el-descriptions-item>
-                 <el-descriptions-item>
-                   <template slot="label"> 采购日期 </template>
-                   <!-- {{info.category.procurementTime}} -->
-                 </el-descriptions-item>
-                 <el-descriptions-item>
-                   <template slot="label"> 过保日期 </template>
-                   <!-- {{info.category.expirationTime}} -->
-                 </el-descriptions-item>
-               </el-descriptions>
+    <el-card :body-style="{ padding: 0 }">
+      <div class="page-container equipment-container">
+        <div class="page-title basic-details-title">
+          <el-page-header @back="$router.go(-1)">
+            <div slot="content" class="pageContent">
+              <div>编辑模具信息</div>
+            </div>
+          </el-page-header>
+          <div>
+            <el-button size="small" @click="$router.go(-1)">取消</el-button>
+            <el-button
+              size="small"
+              type="primary"
+              @click="toSave"
+              v-loading="btnLoading"
+              >确定</el-button
+            >
+          </div>
+        </div>
+        <div class="content">
+          <el-form label-width="100px">
+            <div class="basic-details-title border-none">
+              <span class="border-span">基本信息</span>
+            </div>
+            <el-descriptions title="" :column="4" size="medium" border>
+              <el-descriptions-item>
+                <template slot="label"> 模具编码 </template>
+                {{ info.code }}
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"> 模具名称 </template>
+                {{ info.name }}
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"> 牌号 </template>
+                {{ info.baseInfo.brandNum }}
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"> 型号 </template>
+                {{ info.baseInfo.modelType }}
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"> 大模体型号 </template>
+                {{ info.extraInfo.maxMoldType }}
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"> 芯杆数量 </template>
+                {{ info.extraInfo.coreBarNum }}
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"> 模孔数量 </template>
+                {{ info.extraInfo.dieHoleNum }}
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"> 收缩系数 </template>
+                {{ info.extraInfo.shrinkEffictive }}
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"> 下冲头数量 </template>
+                {{ info.extraInfo.downPunchNum }}
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"> 上冲头数量 </template>
+                {{ info.extraInfo.upperPunchNum }}
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"> 最大冲压次数 </template>
+                {{ info.extraInfo.maxCyTimes }}
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"> 计量单位 </template>
+                {{ info.baseInfo.measuringUnit }}
+              </el-descriptions-item>
+              <el-descriptions-item :span="2">
+                <template slot="label"> 分类 </template>
+                {{ info.baseInfo.categoryLevelPath }}
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"> 采购日期 </template>
+                <!-- {{info.category.procurementTime}} -->
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"> 过保日期 </template>
+                <!-- {{info.category.expirationTime}} -->
+              </el-descriptions-item>
+            </el-descriptions>
 
-               <div class="basic-details-title border-none">
-                 <span class="border-span">资产信息</span>
-               </div>
-               <el-row>
-                 <el-col :md="8" :xs="8" :sm="8">
-                   <el-form-item label="固资编码">
-                     <el-input size="small" v-model="info.fixCode"></el-input>
-                   </el-form-item>
-                 </el-col>
-                 <el-col :md="8" :xs="8" :sm="8">
-                   <el-form-item label="权属部门" prop="ownershipGroupId" class="qsbm">
-                      <ele-tree-select
-                          clearable
-                          :data="treeData"
-                          v-model="info.ownershipGroupId"
-                          placeholder="请选择"
-                          default-expand-all
-                          labelKey="name"
-                          valueKey="id"
-                      />
-                   </el-form-item>
-                 </el-col>
-               </el-row>
+            <div class="basic-details-title border-none">
+              <span class="border-span">资产信息</span>
+            </div>
+            <el-row>
+              <el-col :md="8" :xs="8" :sm="8">
+                <el-form-item label="固资编码">
+                  <el-input size="small" v-model="info.fixCode"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :md="8" :xs="8" :sm="8">
+                <el-form-item label="编号">
+                  <el-input size="small" v-model="info.code1"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :md="8" :xs="8" :sm="8">
+                <el-form-item
+                  label="权属部门"
+                  prop="ownershipGroupId"
+                  class="qsbm"
+                >
+                  <ele-tree-select
+                    clearable
+                    :data="treeData"
+                    v-model="info.ownershipGroupId"
+                    placeholder="请选择"
+                    default-expand-all
+                    labelKey="name"
+                    valueKey="id"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
 
-
-               <div class="basic-details-title border-none">
-                 <span class="border-span">文档信息</span>
-               </div>
-                 <div class="basic-details-title border-none">
-                   <span class="border-span">文档信息</span>
-                 </div>
-                 <div class="upload-container">
-                   <WithView v-model="imageUrl" :limit="1" :assetName="`模具`"/>
-                   <div class="file-list">
-                     <div>
-                       <el-form-item prop="image" label="使用说明书">
-                         <fileUpload
-                           v-model="attUrl.operatingManual.value"
-                           module="main"
-                           :showLib="true"
-                         />
-                       </el-form-item>
-                     </div>
-                     <div>
-                       <el-form-item prop="image" label="生产许可证书">
-                         <fileUpload
-                           v-model="attUrl.productionLicence.value"
-                           module="main"
-                           :showLib="true"
-                         />
-                       </el-form-item>
-                     </div>
-                     <div>
-                       <el-form-item prop="image" label="防爆合格证书">
-                         <fileUpload
-                           v-model="attUrl.explosionProofCertificate.value"
-                           module="main"
-                           :showLib="true"
-                         />
-                       </el-form-item>
-                     </div>
-                     <div>
-                       <el-form-item prop="image" label="检验报告">
-                         <fileUpload
-                           v-model="attUrl.surveyReport.value"
-                           module="main"
-                           :showLib="true"
-                         />
-                       </el-form-item>
-                     </div>
-                     <div>
-                       <el-form-item prop="image" label="检验周期说明">
-                         <fileUpload
-                           v-model="attUrl.inspectionCycleManual.value"
-                           module="main"
-                           :showLib="true"
-                         />
-                       </el-form-item>
-                     </div>
-                     <div>
-                       <el-form-item prop="image" label="图纸资料">
-                         <fileUpload
-                           v-model="attUrl.informationDrawing.value"
-                           module="main"
-                           :showLib="true"
-                         />
-                       </el-form-item>
-                     </div>
-                     <div>
-                       <el-form-item prop="image" label="产品合格证">
-                         <fileUpload
-                           v-model="attUrl.productCertificate.value"
-                           module="main"
-                           :showLib="true"
-                         />
-                       </el-form-item>
-                     </div>
-                   </div>
-                 </div>
-             </el-form>
-               <div class="basic-details-title border-none">
-                 <span class="border-span">扩展信息</span>
-               </div>
-               <el-row>
-                  <el-form :model="itemForm" :rules="customRule" ref="formCustom" class="row-form">
-                       <el-col :span="8" v-for="(item,index) in itemForm.addList" :key="index">
-                            <el-form-item
-                               :prop="'addList.' + index + '.key'"
-                               :rules="{
-                                  required: true, message: '自定义参数名称不能为空', trigger: 'blur'
-                              }"
-                            >
-                              <div  class="add-col">
-                                  <el-input class="col-input" v-model="item.key" placeholder="参数名称"></el-input>
-                                  <el-input class="col-input" v-model="item.value" placeholder="参数值"></el-input>
-                                  <el-button type="text" @click="delt(item,index)"> 删除 </el-button>
-                              </div>
-                            </el-form-item>
-                       </el-col>
-                       <el-col :span="8" v-if="itemForm.addList.length<10">
-                           <el-form-item label-width="20px">
-                                <el-button type="primary" @click="addItem">增加自定义参数</el-button>
-                           </el-form-item>
-                       </el-col>
-                  </el-form>
-               </el-row>
-             </div>
-         </div>
-     </el-card>
+            <div class="basic-details-title border-none">
+              <span class="border-span">文档信息</span>
+            </div>
+            <div class="basic-details-title border-none">
+              <span class="border-span">文档信息</span>
+            </div>
+            <div class="upload-container">
+              <WithView v-model="imageUrl" :limit="1" :assetName="`模具`" />
+              <div class="file-list">
+                <div>
+                  <el-form-item prop="image" label="使用说明书">
+                    <fileUpload
+                      v-model="attUrl.operatingManual.value"
+                      module="main"
+                      :showLib="true"
+                    />
+                  </el-form-item>
+                </div>
+                <div>
+                  <el-form-item prop="image" label="生产许可证书">
+                    <fileUpload
+                      v-model="attUrl.productionLicence.value"
+                      module="main"
+                      :showLib="true"
+                    />
+                  </el-form-item>
+                </div>
+                <div>
+                  <el-form-item prop="image" label="防爆合格证书">
+                    <fileUpload
+                      v-model="attUrl.explosionProofCertificate.value"
+                      module="main"
+                      :showLib="true"
+                    />
+                  </el-form-item>
+                </div>
+                <div>
+                  <el-form-item prop="image" label="检验报告">
+                    <fileUpload
+                      v-model="attUrl.surveyReport.value"
+                      module="main"
+                      :showLib="true"
+                    />
+                  </el-form-item>
+                </div>
+                <div>
+                  <el-form-item prop="image" label="检验周期说明">
+                    <fileUpload
+                      v-model="attUrl.inspectionCycleManual.value"
+                      module="main"
+                      :showLib="true"
+                    />
+                  </el-form-item>
+                </div>
+                <div>
+                  <el-form-item prop="image" label="图纸资料">
+                    <fileUpload
+                      v-model="attUrl.informationDrawing.value"
+                      module="main"
+                      :showLib="true"
+                    />
+                  </el-form-item>
+                </div>
+                <div>
+                  <el-form-item prop="image" label="产品合格证">
+                    <fileUpload
+                      v-model="attUrl.productCertificate.value"
+                      module="main"
+                      :showLib="true"
+                    />
+                  </el-form-item>
+                </div>
+              </div>
+            </div>
+          </el-form>
+          <div class="basic-details-title border-none">
+            <span class="border-span">扩展信息</span>
+          </div>
+          <el-row>
+            <el-form
+              :model="itemForm"
+              :rules="customRule"
+              ref="formCustom"
+              class="row-form"
+            >
+              <el-col
+                :span="8"
+                v-for="(item, index) in itemForm.addList"
+                :key="index"
+              >
+                <el-form-item
+                  :prop="'addList.' + index + '.key'"
+                  :rules="{
+                    required: true,
+                    message: '自定义参数名称不能为空',
+                    trigger: 'blur'
+                  }"
+                >
+                  <div class="add-col">
+                    <el-input
+                      class="col-input"
+                      v-model="item.key"
+                      placeholder="参数名称"
+                    ></el-input>
+                    <el-input
+                      class="col-input"
+                      v-model="item.value"
+                      placeholder="参数值"
+                    ></el-input>
+                    <el-button type="text" @click="delt(item, index)">
+                      删除
+                    </el-button>
+                  </div>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8" v-if="itemForm.addList.length < 10">
+                <el-form-item label-width="20px">
+                  <el-button type="primary" @click="addItem"
+                    >增加自定义参数</el-button
+                  >
+                </el-form-item>
+              </el-col>
+            </el-form>
+          </el-row>
+        </div>
+      </div>
+    </el-card>
   </div>
 </template>
 
 <script>
-  import { getAssetInfo , saveOrEdit } from '@/api/ledgerAssets';
+  import { getAssetInfo, saveOrEdit } from '@/api/ledgerAssets';
   import { listOrganizations } from '@/api/system/organization';
   import fileUpload from '@/components/upload/fileUpload';
   import WithView from '@/components/upload/WithView';
   import imgUpload from '@/components/upload/imgUpload';
-export default {
-  components: {
-    WithView,
-    fileUpload,
-    imgUpload,
-  },
-  data () {
-    return {
-      formData: {},
-      info:{
-        baseInfo:{},
-        extraInfo:{}
-      },
-      customRule:{},
-      itemForm:{
-        addList:[]
-      },
+  export default {
+    components: {
+      WithView,
+      fileUpload,
+      imgUpload
+    },
+    data() {
+      return {
+        formData: {},
+        info: {
+          baseInfo: {},
+          extraInfo: {}
+        },
+        customRule: {},
+        itemForm: {
+          addList: []
+        },
         // 图片
         imageUrl: null,
         // 文档信息
@@ -275,97 +306,96 @@ export default {
             sort: 7
           }
         },
-      treeData:[],
-      btnLoading:false
-    }
-  },
-  created(){
-    let id = this.$route.query.id;
-    this.getDetilInfo(id);
-    this.query();
-  },
-  methods: {
-    // 树形结构数据
-    query() {
-      listOrganizations()
-        .then((list) => {
-          this.treeData = this.$util.toTreeData({
-            data: list,
-            idField: 'id',
-            parentIdField: 'parentId'
-          });
-        })
-        .catch((e) => {
-        });
+        treeData: [],
+        btnLoading: false
+      };
     },
-
-    setImgs(type, sort, info) {
-      if (info[0]) {
-        this.attUrl[type] = info[0];
-        this.attUrl[type].sort = sort;
-      } else {
-        this.attUrl[type] = null;
-      }
+    created() {
+      let id = this.$route.query.id;
+      this.getDetilInfo(id);
+      this.query();
     },
-    // 处理文档信息
-    setWd() {
-      let attUrl = [];
-      Object.entries(this.attUrl).forEach(([key, value], index) => {
-        if (value) {
-          attUrl.push(value);
+    methods: {
+      // 树形结构数据
+      query() {
+        listOrganizations()
+          .then((list) => {
+            this.treeData = this.$util.toTreeData({
+              data: list,
+              idField: 'id',
+              parentIdField: 'parentId'
+            });
+          })
+          .catch((e) => {});
+      },
+
+      setImgs(type, sort, info) {
+        if (info[0]) {
+          this.attUrl[type] = info[0];
+          this.attUrl[type].sort = sort;
         } else {
-          attUrl.push({ sort: index + 1 });
+          this.attUrl[type] = null;
         }
-      });
-      return attUrl;
-    },
-    async getDetilInfo(id){
-      const data = await getAssetInfo(id)
-      if (data){
-         this.info = data
-         this.$set(this.info, 'baseInfo', data.category.category)
-         this.$set(this.info, 'extraInfo', data.category.categoryMold)
-         this.itemForm.addList =  this.info.extInfoSelf
-          ?  this.info.extInfoSelf
-          : [];
-         if (data.attUrl && data.attUrl.length > 0) {
-           // 文档信息
-           Object.keys(this.attUrl).forEach((n, index) => {
-             this.attUrl[n].value =
-               (data.attUrl[index]?.storePath && [data.attUrl[index]]) || [];
-           });
-         }
+      },
+      // 处理文档信息
+      setWd() {
+        let attUrl = [];
+        Object.entries(this.attUrl).forEach(([key, value], index) => {
+          if (value) {
+            attUrl.push(value);
+          } else {
+            attUrl.push({ sort: index + 1 });
+          }
+        });
+        return attUrl;
+      },
+      async getDetilInfo(id) {
+        const data = await getAssetInfo(id);
+        if (data) {
+          this.info = data;
+          this.$set(this.info, 'baseInfo', data.category.category);
+          this.$set(this.info, 'extraInfo', data.category.categoryMold);
+          this.itemForm.addList = this.info.extInfoSelf
+            ? this.info.extInfoSelf
+            : [];
+          if (data.attUrl && data.attUrl.length > 0) {
+            // 文档信息
+            Object.keys(this.attUrl).forEach((n, index) => {
+              this.attUrl[n].value =
+                (data.attUrl[index]?.storePath && [data.attUrl[index]]) || [];
+            });
+          }
 
-         // 设备图片
-         this.imageUrl = data.imageUrl|| {};
-      }
-    },
+          // 设备图片
+          this.imageUrl = data.imageUrl || {};
+        }
+      },
 
-    // 选择图片回调
-    cbUploadImg(data) {
-      if (data.length > 0) {
-        this.imageUrl = data[0];
-      } else {
-        this.imageUrl = "";
-      }
-    },
+      // 选择图片回调
+      cbUploadImg(data) {
+        if (data.length > 0) {
+          this.imageUrl = data[0];
+        } else {
+          this.imageUrl = '';
+        }
+      },
 
-    // 删除自定义参数
-    delt(item,index){
-        this.itemForm.addList.splice(index,1)
-    },
-    // 添加自定义参数
-    addItem(){
-      if(this.itemForm.addList.length<10){
-        let item = {key:'',value:''}
-         this.itemForm.addList.push(item)
-      }else{
-        this.$message.warning('自定义参数最多添加10条')
-      }
-    },
+      // 删除自定义参数
+      delt(item, index) {
+        this.itemForm.addList.splice(index, 1);
+      },
+      // 添加自定义参数
+      addItem() {
+        if (this.itemForm.addList.length < 10) {
+          let item = { key: '', value: '' };
+          this.itemForm.addList.push(item);
+        } else {
+          this.$message.warning('自定义参数最多添加10条');
+        }
+      },
 
       // 点击确定保存
-      toSave () {
+      toSave() {
         let extendField = this.itemForm.addList;
         let params = {
           id: this.info.id,
@@ -373,89 +403,93 @@ export default {
           fixCode: this.info.fixCode,
           extInfoSelf: extendField,
           ownershipGroupId: this.info.ownershipGroupId,
-          rootCategoryLevelId:this.info.rootCategoryLevelId,
-          categoryId:this.info.categoryId,
+          rootCategoryLevelId: this.info.rootCategoryLevelId,
+          categoryId: this.info.categoryId,
           // positionIds: JSON.parse(this.info.category.categoryLevelPathId).join(','),
-          position: typeof this.info.positionList == 'string'?{}:this.info.positionList[0],
+          position:
+            typeof this.info.positionList == 'string'
+              ? {}
+              : this.info.positionList[0],
           // 文档信息
           attUrl: this.setWd() || [],
           // // 设备图片
-          imageUrl: this.imageUrl || {},
+          imageUrl: this.imageUrl || {}
         };
         this.btnLoading = true;
         this.$refs['formCustom'].validate((valid) => {
           if (valid) {
-            saveOrEdit(params).then((res) => {
-              if (res) {
-                this.$message.success('模具编辑成功');
-                this.$router.go(-1);
-              }
-            })
-            .finally(() => {
-              this.btnLoading = false;
-            });
+            saveOrEdit(params)
+              .then((res) => {
+                if (res) {
+                  this.$message.success('模具编辑成功');
+                  this.$router.go(-1);
+                }
+              })
+              .finally(() => {
+                this.btnLoading = false;
+              });
           } else {
             return false;
           }
         });
       },
-    // 处理文档信息
-    setWd () {
-      return Object.values(this.attUrl).map((item) => ({
-        ...(item.value[0] || {}),
-        sort: item.sort
-      }));
-    },
-  }
-}
+      // 处理文档信息
+      setWd() {
+        return Object.values(this.attUrl).map((item) => ({
+          ...(item.value[0] || {}),
+          sort: item.sort
+        }));
+      }
+    }
+  };
 </script>
 
 <style lang="scss" scoped>
-.equipment-container {
-  background-color: #fff;
-  padding: 20px;
-  .content {
-    padding: 0 20px;
-  }
-  .page-title{
-    width:100%;
-    padding-bottom: 10px;
-    border-bottom:1px solid #ccc;
-  }
-  .basic-details-title {
-    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin: 15px 0px;
-    font-size: 16px;
-  }
-  .label-none {
-    .el-form-item__content {
-      margin-left: 0 !important;
+  .equipment-container {
+    background-color: #fff;
+    padding: 20px;
+    .content {
+      padding: 0 20px;
     }
-  }
-  .upload-container {
-    display: flex;
-    .file-list {
-      margin-left: 50px;
-      flex: 1;
+    .page-title {
+      width: 100%;
+      padding-bottom: 10px;
+      border-bottom: 1px solid #ccc;
+    }
+    .basic-details-title {
+      width: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      margin: 15px 0px;
+      font-size: 16px;
+    }
+    .label-none {
+      .el-form-item__content {
+        margin-left: 0 !important;
+      }
+    }
+    .upload-container {
+      display: flex;
+      .file-list {
+        margin-left: 50px;
+        flex: 1;
+      }
     }
-  }
 
-  .row-form{
-    width:100%;
-    .add-col{
-      display:flex;
-      align-items:center;
-      margin-left: 20px;
-      .col-input{
-        margin-right:5px;
+    .row-form {
+      width: 100%;
+      .add-col {
+        display: flex;
+        align-items: center;
+        margin-left: 20px;
+        .col-input {
+          margin-right: 5px;
+        }
       }
     }
+    .qsbm .el-select {
+      width: 100%;
+    }
   }
-  .qsbm .el-select{
-    width:100%
-  }
-}
 </style>

src/views/ledgerAssets/mould/components/mould-list.vue

@@ -120,6 +120,12 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
+          {
+            prop: 'cod1',
+            label: '编号',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             prop: 'fixCode',
             label: '固资编码',

src/views/ledgerAssets/mould/edit.vue

@@ -81,6 +81,11 @@
                   <el-input size="small" v-model="info.fixCode"></el-input>
                 </el-form-item>
               </el-col>
+              <el-col :md="6" :xs="6" :sm="6">
+                <el-form-item label="编号">
+                  <el-input size="small" v-model="info.code1"></el-input>
+                </el-form-item>
+              </el-col>
               <el-col :md="6" :xs="6" :sm="6">
                 <el-form-item label="冲压次数">
                   <el-input size="small" v-model="info.cycs"></el-input>

src/views/ledgerAssets/office/components/data-list.vue

@@ -119,6 +119,12 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
+          {
+            prop: 'code1',
+            label: '编号',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             prop: 'fixCode',
             label: '固资编码',

src/views/ledgerAssets/office/edit.vue

@@ -1,247 +1,278 @@
 <template>
   <div class="ele-body">
-     <el-card :body-style="{ padding: 0 }">
-         <div class="page-container equipment-container">
-           <div class="page-title basic-details-title">
-             <el-page-header @back="$router.go(-1)">
-               <div slot="content" class="pageContent">
-                 <div>编辑模具信息</div>
-               </div>
-             </el-page-header>
-             <div>
-               <el-button size="small" @click="$router.go(-1)">取消</el-button>
-               <el-button
-                 size="small"
-                 type="primary"
-                  @click="toSave"
-                 v-loading="btnLoading"
-                 >确定</el-button
-               >
-             </div>
-           </div>
-           <div class="content">
-             <el-form label-width="100px">
-               <div class="basic-details-title border-none">
-                 <span class="border-span">基本信息</span>
-               </div>
-               <el-descriptions title="" :column="4" size="medium" border>
-                 <el-descriptions-item>
-                   <template slot="label"> 模具编码 </template>
-                   {{info.code}}
-                 </el-descriptions-item>
-                 <el-descriptions-item>
-                   <template slot="label"> 模具名称 </template>
-                   {{info.name}}
-                 </el-descriptions-item>
-                 <el-descriptions-item>
-                   <template slot="label"> 牌号 </template>
-                   {{info.baseInfo.brandNum}}
-                 </el-descriptions-item>
-                 <el-descriptions-item>
-                   <template slot="label"> 型号 </template>
-                   {{info.baseInfo.modelType}}
-                 </el-descriptions-item>
-                 <el-descriptions-item>
-                   <template slot="label"> 大模体型号 </template>
-                   {{info.extraInfo.maxMoldType}}
-                 </el-descriptions-item>
-                 <el-descriptions-item>
-                   <template slot="label"> 芯杆数量 </template>
-                   {{info.extraInfo.coreBarNum}}
-                 </el-descriptions-item>
-                 <el-descriptions-item>
-                   <template slot="label"> 模孔数量 </template>
-                   {{info.extraInfo.dieHoleNum}}
-                 </el-descriptions-item>
-                 <el-descriptions-item>
-                   <template slot="label"> 收缩系数 </template>
-                   {{info.extraInfo.shrinkEffictive}}
-                 </el-descriptions-item>
-                 <el-descriptions-item>
-                   <template slot="label"> 下冲头数量 </template>
-                   {{info.extraInfo.downPunchNum}}
-                 </el-descriptions-item>
-                 <el-descriptions-item>
-                   <template slot="label"> 上冲头数量 </template>
-                   {{info.extraInfo.upperPunchNum}}
-                 </el-descriptions-item>
-                 <el-descriptions-item>
-                   <template slot="label"> 最大冲压次数 </template>
-                   {{info.extraInfo.maxCyTimes}}
-                 </el-descriptions-item>
-                 <el-descriptions-item>
-                   <template slot="label"> 计量单位 </template>
-                   {{info.baseInfo.measuringUnit}}
-                 </el-descriptions-item>
-                 <el-descriptions-item :span="2">
-                   <template slot="label"> 分类 </template>
-                   {{info.baseInfo.categoryLevelPath}}
-                 </el-descriptions-item>
-                 <el-descriptions-item>
-                   <template slot="label"> 采购日期 </template>
-                   <!-- {{info.category.procurementTime}} -->
-                 </el-descriptions-item>
-                 <el-descriptions-item>
-                   <template slot="label"> 过保日期 </template>
-                   <!-- {{info.category.expirationTime}} -->
-                 </el-descriptions-item>
-               </el-descriptions>
+    <el-card :body-style="{ padding: 0 }">
+      <div class="page-container equipment-container">
+        <div class="page-title basic-details-title">
+          <el-page-header @back="$router.go(-1)">
+            <div slot="content" class="pageContent">
+              <div>编辑模具信息</div>
+            </div>
+          </el-page-header>
+          <div>
+            <el-button size="small" @click="$router.go(-1)">取消</el-button>
+            <el-button
+              size="small"
+              type="primary"
+              @click="toSave"
+              v-loading="btnLoading"
+              >确定</el-button
+            >
+          </div>
+        </div>
+        <div class="content">
+          <el-form label-width="100px">
+            <div class="basic-details-title border-none">
+              <span class="border-span">基本信息</span>
+            </div>
+            <el-descriptions title="" :column="4" size="medium" border>
+              <el-descriptions-item>
+                <template slot="label"> 模具编码 </template>
+                {{ info.code }}
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"> 模具名称 </template>
+                {{ info.name }}
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"> 牌号 </template>
+                {{ info.baseInfo.brandNum }}
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"> 型号 </template>
+                {{ info.baseInfo.modelType }}
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"> 大模体型号 </template>
+                {{ info.extraInfo.maxMoldType }}
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"> 芯杆数量 </template>
+                {{ info.extraInfo.coreBarNum }}
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"> 模孔数量 </template>
+                {{ info.extraInfo.dieHoleNum }}
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"> 收缩系数 </template>
+                {{ info.extraInfo.shrinkEffictive }}
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"> 下冲头数量 </template>
+                {{ info.extraInfo.downPunchNum }}
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"> 上冲头数量 </template>
+                {{ info.extraInfo.upperPunchNum }}
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"> 最大冲压次数 </template>
+                {{ info.extraInfo.maxCyTimes }}
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"> 计量单位 </template>
+                {{ info.baseInfo.measuringUnit }}
+              </el-descriptions-item>
+              <el-descriptions-item :span="2">
+                <template slot="label"> 分类 </template>
+                {{ info.baseInfo.categoryLevelPath }}
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"> 采购日期 </template>
+                <!-- {{info.category.procurementTime}} -->
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"> 过保日期 </template>
+                <!-- {{info.category.expirationTime}} -->
+              </el-descriptions-item>
+            </el-descriptions>
 
-               <div class="basic-details-title border-none">
-                 <span class="border-span">资产信息</span>
-               </div>
-               <el-row>
-                 <el-col :md="8" :xs="8" :sm="8">
-                   <el-form-item label="固资编码">
-                     <el-input size="small" v-model="info.fixCode"></el-input>
-                   </el-form-item>
-                 </el-col>
-                 <el-col :md="8" :xs="8" :sm="8">
-                   <el-form-item label="权属部门" prop="ownershipGroupId" class="qsbm">
-                      <ele-tree-select
-                          clearable
-                          :data="treeData"
-                          v-model="info.ownershipGroupId"
-                          placeholder="请选择"
-                          default-expand-all
-                          labelKey="name"
-                          valueKey="id"
-                      />
-                   </el-form-item>
-                 </el-col>
-               </el-row>
+            <div class="basic-details-title border-none">
+              <span class="border-span">资产信息</span>
+            </div>
+            <el-row>
+              <el-col :md="8" :xs="8" :sm="8">
+                <el-form-item label="固资编码">
+                  <el-input size="small" v-model="info.fixCode"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :md="8" :xs="8" :sm="8">
+                <el-form-item label="编号">
+                  <el-input size="small" v-model="info.code1"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :md="8" :xs="8" :sm="8">
+                <el-form-item
+                  label="权属部门"
+                  prop="ownershipGroupId"
+                  class="qsbm"
+                >
+                  <ele-tree-select
+                    clearable
+                    :data="treeData"
+                    v-model="info.ownershipGroupId"
+                    placeholder="请选择"
+                    default-expand-all
+                    labelKey="name"
+                    valueKey="id"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
 
-
-               <div class="basic-details-title border-none">
-                 <span class="border-span">文档信息</span>
-               </div>
-                 <div class="basic-details-title border-none">
-                   <span class="border-span">文档信息</span>
-                 </div>
-                 <div class="upload-container">
-                   <WithView v-model="imageUrl" :limit="1" :assetName="`模具`"/>
-                   <div class="file-list">
-                     <div>
-                       <el-form-item prop="image" label="使用说明书">
-                         <fileUpload
-                           v-model="attUrl.operatingManual.value"
-                           module="main"
-                           :showLib="true"
-                         />
-                       </el-form-item>
-                     </div>
-                     <div>
-                       <el-form-item prop="image" label="生产许可证书">
-                         <fileUpload
-                           v-model="attUrl.productionLicence.value"
-                           module="main"
-                           :showLib="true"
-                         />
-                       </el-form-item>
-                     </div>
-                     <div>
-                       <el-form-item prop="image" label="防爆合格证书">
-                         <fileUpload
-                           v-model="attUrl.explosionProofCertificate.value"
-                           module="main"
-                           :showLib="true"
-                         />
-                       </el-form-item>
-                     </div>
-                     <div>
-                       <el-form-item prop="image" label="检验报告">
-                         <fileUpload
-                           v-model="attUrl.surveyReport.value"
-                           module="main"
-                           :showLib="true"
-                         />
-                       </el-form-item>
-                     </div>
-                     <div>
-                       <el-form-item prop="image" label="检验周期说明">
-                         <fileUpload
-                           v-model="attUrl.inspectionCycleManual.value"
-                           module="main"
-                           :showLib="true"
-                         />
-                       </el-form-item>
-                     </div>
-                     <div>
-                       <el-form-item prop="image" label="图纸资料">
-                         <fileUpload
-                           v-model="attUrl.informationDrawing.value"
-                           module="main"
-                           :showLib="true"
-                         />
-                       </el-form-item>
-                     </div>
-                     <div>
-                       <el-form-item prop="image" label="产品合格证">
-                         <fileUpload
-                           v-model="attUrl.productCertificate.value"
-                           module="main"
-                           :showLib="true"
-                         />
-                       </el-form-item>
-                     </div>
-                   </div>
-                 </div>
-             </el-form>
-               <div class="basic-details-title border-none">
-                 <span class="border-span">扩展信息</span>
-               </div>
-               <el-row>
-                  <el-form :model="itemForm" :rules="customRule" ref="formCustom" class="row-form">
-                       <el-col :span="8" v-for="(item,index) in itemForm.addList" :key="index">
-                            <el-form-item
-                               :prop="'addList.' + index + '.key'"
-                               :rules="{
-                                  required: true, message: '自定义参数名称不能为空', trigger: 'blur'
-                              }"
-                            >
-                              <div  class="add-col">
-                                  <el-input class="col-input" v-model="item.key" placeholder="参数名称"></el-input>
-                                  <el-input class="col-input" v-model="item.value" placeholder="参数值"></el-input>
-                                  <el-button type="text" @click="delt(item,index)"> 删除 </el-button>
-                              </div>
-                            </el-form-item>
-                       </el-col>
-                       <el-col :span="8" v-if="itemForm.addList.length<10">
-                           <el-form-item label-width="20px">
-                                <el-button type="primary" @click="addItem">增加自定义参数</el-button>
-                           </el-form-item>
-                       </el-col>
-                  </el-form>
-               </el-row>
-             </div>
-         </div>
-     </el-card>
+            <div class="basic-details-title border-none">
+              <span class="border-span">文档信息</span>
+            </div>
+            <div class="basic-details-title border-none">
+              <span class="border-span">文档信息</span>
+            </div>
+            <div class="upload-container">
+              <WithView v-model="imageUrl" :limit="1" :assetName="`模具`" />
+              <div class="file-list">
+                <div>
+                  <el-form-item prop="image" label="使用说明书">
+                    <fileUpload
+                      v-model="attUrl.operatingManual.value"
+                      module="main"
+                      :showLib="true"
+                    />
+                  </el-form-item>
+                </div>
+                <div>
+                  <el-form-item prop="image" label="生产许可证书">
+                    <fileUpload
+                      v-model="attUrl.productionLicence.value"
+                      module="main"
+                      :showLib="true"
+                    />
+                  </el-form-item>
+                </div>
+                <div>
+                  <el-form-item prop="image" label="防爆合格证书">
+                    <fileUpload
+                      v-model="attUrl.explosionProofCertificate.value"
+                      module="main"
+                      :showLib="true"
+                    />
+                  </el-form-item>
+                </div>
+                <div>
+                  <el-form-item prop="image" label="检验报告">
+                    <fileUpload
+                      v-model="attUrl.surveyReport.value"
+                      module="main"
+                      :showLib="true"
+                    />
+                  </el-form-item>
+                </div>
+                <div>
+                  <el-form-item prop="image" label="检验周期说明">
+                    <fileUpload
+                      v-model="attUrl.inspectionCycleManual.value"
+                      module="main"
+                      :showLib="true"
+                    />
+                  </el-form-item>
+                </div>
+                <div>
+                  <el-form-item prop="image" label="图纸资料">
+                    <fileUpload
+                      v-model="attUrl.informationDrawing.value"
+                      module="main"
+                      :showLib="true"
+                    />
+                  </el-form-item>
+                </div>
+                <div>
+                  <el-form-item prop="image" label="产品合格证">
+                    <fileUpload
+                      v-model="attUrl.productCertificate.value"
+                      module="main"
+                      :showLib="true"
+                    />
+                  </el-form-item>
+                </div>
+              </div>
+            </div>
+          </el-form>
+          <div class="basic-details-title border-none">
+            <span class="border-span">扩展信息</span>
+          </div>
+          <el-row>
+            <el-form
+              :model="itemForm"
+              :rules="customRule"
+              ref="formCustom"
+              class="row-form"
+            >
+              <el-col
+                :span="8"
+                v-for="(item, index) in itemForm.addList"
+                :key="index"
+              >
+                <el-form-item
+                  :prop="'addList.' + index + '.key'"
+                  :rules="{
+                    required: true,
+                    message: '自定义参数名称不能为空',
+                    trigger: 'blur'
+                  }"
+                >
+                  <div class="add-col">
+                    <el-input
+                      class="col-input"
+                      v-model="item.key"
+                      placeholder="参数名称"
+                    ></el-input>
+                    <el-input
+                      class="col-input"
+                      v-model="item.value"
+                      placeholder="参数值"
+                    ></el-input>
+                    <el-button type="text" @click="delt(item, index)">
+                      删除
+                    </el-button>
+                  </div>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8" v-if="itemForm.addList.length < 10">
+                <el-form-item label-width="20px">
+                  <el-button type="primary" @click="addItem"
+                    >增加自定义参数</el-button
+                  >
+                </el-form-item>
+              </el-col>
+            </el-form>
+          </el-row>
+        </div>
+      </div>
+    </el-card>
   </div>
 </template>
 
 <script>
-  import { getAssetInfo , saveOrEdit } from '@/api/ledgerAssets';
+  import { getAssetInfo, saveOrEdit } from '@/api/ledgerAssets';
   import { listOrganizations } from '@/api/system/organization';
   import fileUpload from '@/components/upload/fileUpload';
   import WithView from '@/components/upload/WithView';
   import imgUpload from '@/components/upload/imgUpload';
-export default {
-  components: {
-    WithView,
-    fileUpload,
-    imgUpload,
-  },
-  data () {
-    return {
-      formData: {},
-      info:{
-        baseInfo:{},
-        extraInfo:{}
-      },
-      customRule:{},
-      itemForm:{
-        addList:[]
-      },
+  export default {
+    components: {
+      WithView,
+      fileUpload,
+      imgUpload
+    },
+    data() {
+      return {
+        formData: {},
+        info: {
+          baseInfo: {},
+          extraInfo: {}
+        },
+        customRule: {},
+        itemForm: {
+          addList: []
+        },
         // 图片
         imageUrl: null,
         // 文档信息
@@ -275,97 +306,96 @@ export default {
             sort: 7
           }
         },
-      treeData:[],
-      btnLoading:false
-    }
-  },
-  created(){
-    let id = this.$route.query.id;
-    this.getDetilInfo(id);
-    this.query();
-  },
-  methods: {
-    // 树形结构数据
-    query() {
-      listOrganizations()
-        .then((list) => {
-          this.treeData = this.$util.toTreeData({
-            data: list,
-            idField: 'id',
-            parentIdField: 'parentId'
-          });
-        })
-        .catch((e) => {
-        });
+        treeData: [],
+        btnLoading: false
+      };
     },
-
-    setImgs(type, sort, info) {
-      if (info[0]) {
-        this.attUrl[type] = info[0];
-        this.attUrl[type].sort = sort;
-      } else {
-        this.attUrl[type] = null;
-      }
+    created() {
+      let id = this.$route.query.id;
+      this.getDetilInfo(id);
+      this.query();
     },
-    // 处理文档信息
-    setWd() {
-      let attUrl = [];
-      Object.entries(this.attUrl).forEach(([key, value], index) => {
-        if (value) {
-          attUrl.push(value);
+    methods: {
+      // 树形结构数据
+      query() {
+        listOrganizations()
+          .then((list) => {
+            this.treeData = this.$util.toTreeData({
+              data: list,
+              idField: 'id',
+              parentIdField: 'parentId'
+            });
+          })
+          .catch((e) => {});
+      },
+
+      setImgs(type, sort, info) {
+        if (info[0]) {
+          this.attUrl[type] = info[0];
+          this.attUrl[type].sort = sort;
         } else {
-          attUrl.push({ sort: index + 1 });
+          this.attUrl[type] = null;
         }
-      });
-      return attUrl;
-    },
-    async getDetilInfo(id){
-      const data = await getAssetInfo(id)
-      if (data){
-         this.info = data
-         this.$set(this.info, 'baseInfo', data.category.category)
-         this.$set(this.info, 'extraInfo', data.category.categoryMold)
-         this.itemForm.addList =  this.info.extInfoSelf
-          ?  this.info.extInfoSelf
-          : [];
-         if (data.attUrl && data.attUrl.length > 0) {
-           // 文档信息
-           Object.keys(this.attUrl).forEach((n, index) => {
-             this.attUrl[n].value =
-               (data.attUrl[index]?.storePath && [data.attUrl[index]]) || [];
-           });
-         }
+      },
+      // 处理文档信息
+      setWd() {
+        let attUrl = [];
+        Object.entries(this.attUrl).forEach(([key, value], index) => {
+          if (value) {
+            attUrl.push(value);
+          } else {
+            attUrl.push({ sort: index + 1 });
+          }
+        });
+        return attUrl;
+      },
+      async getDetilInfo(id) {
+        const data = await getAssetInfo(id);
+        if (data) {
+          this.info = data;
+          this.$set(this.info, 'baseInfo', data.category.category);
+          this.$set(this.info, 'extraInfo', data.category.categoryMold);
+          this.itemForm.addList = this.info.extInfoSelf
+            ? this.info.extInfoSelf
+            : [];
+          if (data.attUrl && data.attUrl.length > 0) {
+            // 文档信息
+            Object.keys(this.attUrl).forEach((n, index) => {
+              this.attUrl[n].value =
+                (data.attUrl[index]?.storePath && [data.attUrl[index]]) || [];
+            });
+          }
 
-         // 设备图片
-         this.imageUrl = data.imageUrl|| {};
-      }
-    },
+          // 设备图片
+          this.imageUrl = data.imageUrl || {};
+        }
+      },
 
-    // 选择图片回调
-    cbUploadImg(data) {
-      if (data.length > 0) {
-        this.imageUrl = data[0];
-      } else {
-        this.imageUrl = "";
-      }
-    },
+      // 选择图片回调
+      cbUploadImg(data) {
+        if (data.length > 0) {
+          this.imageUrl = data[0];
+        } else {
+          this.imageUrl = '';
+        }
+      },
 
-    // 删除自定义参数
-    delt(item,index){
-        this.itemForm.addList.splice(index,1)
-    },
-    // 添加自定义参数
-    addItem(){
-      if(this.itemForm.addList.length<10){
-        let item = {key:'',value:''}
-         this.itemForm.addList.push(item)
-      }else{
-        this.$message.warning('自定义参数最多添加10条')
-      }
-    },
+      // 删除自定义参数
+      delt(item, index) {
+        this.itemForm.addList.splice(index, 1);
+      },
+      // 添加自定义参数
+      addItem() {
+        if (this.itemForm.addList.length < 10) {
+          let item = { key: '', value: '' };
+          this.itemForm.addList.push(item);
+        } else {
+          this.$message.warning('自定义参数最多添加10条');
+        }
+      },
 
       // 点击确定保存
-      toSave () {
+      toSave() {
         let extendField = this.itemForm.addList;
         let params = {
           id: this.info.id,
@@ -373,89 +403,93 @@ export default {
           fixCode: this.info.fixCode,
           extInfoSelf: extendField,
           ownershipGroupId: this.info.ownershipGroupId,
-          rootCategoryLevelId:this.info.rootCategoryLevelId,
-          categoryId:this.info.categoryId,
+          rootCategoryLevelId: this.info.rootCategoryLevelId,
+          categoryId: this.info.categoryId,
           // positionIds: JSON.parse(this.info.category.categoryLevelPathId).join(','),
-          position: typeof this.info.positionList == 'string'?{}:this.info.positionList[0],
+          position:
+            typeof this.info.positionList == 'string'
+              ? {}
+              : this.info.positionList[0],
           // 文档信息
           attUrl: this.setWd() || [],
           // // 设备图片
-          imageUrl: this.imageUrl || {},
+          imageUrl: this.imageUrl || {}
         };
         this.btnLoading = true;
         this.$refs['formCustom'].validate((valid) => {
           if (valid) {
-            saveOrEdit(params).then((res) => {
-              if (res) {
-                this.$message.success('模具编辑成功');
-                this.$router.go(-1);
-              }
-            })
-            .finally(() => {
-              this.btnLoading = false;
-            });
+            saveOrEdit(params)
+              .then((res) => {
+                if (res) {
+                  this.$message.success('模具编辑成功');
+                  this.$router.go(-1);
+                }
+              })
+              .finally(() => {
+                this.btnLoading = false;
+              });
           } else {
             return false;
           }
         });
       },
-    // 处理文档信息
-    setWd () {
-      return Object.values(this.attUrl).map((item) => ({
-        ...(item.value[0] || {}),
-        sort: item.sort
-      }));
-    },
-  }
-}
+      // 处理文档信息
+      setWd() {
+        return Object.values(this.attUrl).map((item) => ({
+          ...(item.value[0] || {}),
+          sort: item.sort
+        }));
+      }
+    }
+  };
 </script>
 
 <style lang="scss" scoped>
-.equipment-container {
-  background-color: #fff;
-  padding: 20px;
-  .content {
-    padding: 0 20px;
-  }
-  .page-title{
-    width:100%;
-    padding-bottom: 10px;
-    border-bottom:1px solid #ccc;
-  }
-  .basic-details-title {
-    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin: 15px 0px;
-    font-size: 16px;
-  }
-  .label-none {
-    .el-form-item__content {
-      margin-left: 0 !important;
+  .equipment-container {
+    background-color: #fff;
+    padding: 20px;
+    .content {
+      padding: 0 20px;
     }
-  }
-  .upload-container {
-    display: flex;
-    .file-list {
-      margin-left: 50px;
-      flex: 1;
+    .page-title {
+      width: 100%;
+      padding-bottom: 10px;
+      border-bottom: 1px solid #ccc;
+    }
+    .basic-details-title {
+      width: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      margin: 15px 0px;
+      font-size: 16px;
+    }
+    .label-none {
+      .el-form-item__content {
+        margin-left: 0 !important;
+      }
+    }
+    .upload-container {
+      display: flex;
+      .file-list {
+        margin-left: 50px;
+        flex: 1;
+      }
     }
-  }
 
-  .row-form{
-    width:100%;
-    .add-col{
-      display:flex;
-      align-items:center;
-      margin-left: 20px;
-      .col-input{
-        margin-right:5px;
+    .row-form {
+      width: 100%;
+      .add-col {
+        display: flex;
+        align-items: center;
+        margin-left: 20px;
+        .col-input {
+          margin-right: 5px;
+        }
       }
     }
+    .qsbm .el-select {
+      width: 100%;
+    }
   }
-  .qsbm .el-select{
-    width:100%
-  }
-}
 </style>

src/views/ledgerAssets/sparepart/components/sparepart-list.vue

@@ -120,6 +120,12 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
+          {
+            prop: 'code1',
+            label: '编号',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             prop: 'fixCode',
             label: '固资编码',

src/views/ledgerAssets/sparepart/edit.vue

@@ -32,6 +32,11 @@
                   <el-input size="small" v-model="info.fixCode"></el-input>
                 </el-form-item>
               </el-col>
+              <el-col :md="8" :xs="8" :sm="8">
+                <el-form-item label="编号">
+                  <el-input size="small" v-model="info.code1"></el-input>
+                </el-form-item>
+              </el-col>
               <el-col :md="8" :xs="8" :sm="8">
                 <!-- :initStr="info.ownershipDeptCode" -->
                 <el-form-item

src/views/ledgerAssets/turnoverCar/components/turnovercar-list.vue

@@ -113,6 +113,12 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
+          {
+            prop: 'code1',
+            label: '编号',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             prop: 'fixCode',
             label: '固资编码',

src/views/ledgerAssets/turnoverCar/edit.vue

@@ -39,6 +39,16 @@
                     ></el-input
                   ></el-form-item>
                 </el-col>
+                <el-col :md="8" :xs="8" :sm="8">
+                  <el-form-item label="编号" prop="code1">
+                    <el-input
+                      v-model="info.code1"
+                      type="text"
+                      size="small"
+                      placeholder="请输入"
+                    ></el-input
+                  ></el-form-item>
+                </el-col>
                 <el-col :md="8" :xs="8" :sm="8">
                   <el-form-item label="权属部门" prop="name" class="qsbm">
                     <ele-tree-select