add

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

@@ -81,7 +81,7 @@
             minWidth: 110
           },
           {
-            prop: 'code1',
+            prop: 'codeNumber',
             label: '编号',
             showOverflowTooltip: true,
             minWidth: 110

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

@@ -107,7 +107,7 @@
             minWidth: 110
           },
           {
-            prop: 'code1',
+            prop: 'codeNumber',
             label: '编号',
             showOverflowTooltip: true,
             minWidth: 110

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

@@ -151,7 +151,6 @@
           //   minWidth: 110,
           //   slot: 'code'
           // },
-    
 
           {
             prop: 'name',
@@ -166,7 +165,7 @@
             minWidth: 110
           },
           {
-            prop: 'code1',
+            prop: 'codeNumber',
             label: '编号',
             showOverflowTooltip: true,
             minWidth: 110

src/views/ledgerAssets/equipment/edit.vue

@@ -179,7 +179,7 @@
             <el-descriptions-item>
               <template slot="label"> 编号 </template>
               <el-form-item label-width="0">
-                <el-input class="input" v-model="zcInfo.code1"></el-input>
+                <el-input class="input" v-model="zcInfo.codeNumber"></el-input>
               </el-form-item>
             </el-descriptions-item>
             <el-descriptions-item>
@@ -869,6 +869,7 @@
         this.id = this.$route.query.id;
         this.getInfo();
         this.title = '编辑设备信息';
+        this.getgys();
       }
     },
     methods: {
@@ -1021,7 +1022,7 @@
                 detailPosition: this.positionInfo.detailPosition,
                 pathIds: `${this.positionInfo.factoryCode},${this.positionInfo.workshopCode},${this.positionInfo.lineCode}`,
                 pathName: `${this.positionInfo.factoryName},${this.positionInfo.workshopName},${this.positionInfo.lineName}`,
-                type: 'PRODUCTION_LINE',
+                type: '1',
                 num: 1
               },
               // 文档信息
@@ -1031,12 +1032,22 @@
               // 是否启用物联
               isIotEnable: this.isIotEnable
               // // 扩展字段
+
               // extInfoSelf: this.setKz()
             };
+            //============================
+            par.extInfo = { ...this.zcInfo };
+            let obj = {};
+            par.extInfoSelf.forEach((item) => {
+              obj[item.key] = item.value;
+            });
+            par.extInfoSelf = obj;
+            //============================
             if (this.pageType == 'edit') {
               par.id = this.id;
             }
             this.btnLoading = true;
+            console.log('sasasasa', par);
             saveOrEdit(par)
               .then((res) => {
                 this.$message.success('操作成功');

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

@@ -309,7 +309,7 @@
               qrCode: el.qrCode,
               sizeLong: el.sizeLong,
               sizeWide: el.sizeWide,
-              code1: useModeList[0].sampleData,
+              codeNumber: useModeList[0].sampleData,
               code2: useModeList[1].sampleData,
               code3: useModeList[2].sampleData,
               code4: useModeList[3].sampleData,

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

@@ -120,7 +120,7 @@
             minWidth: 110
           },
           {
-            prop: 'code1',
+            prop: 'codeNumber',
             label: '编号',
             showOverflowTooltip: true,
             minWidth: 110

src/views/ledgerAssets/meter/edit.vue

@@ -98,7 +98,7 @@
               </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-input size="small" v-model="info.codeNumber"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :md="8" :xs="8" :sm="8">

src/views/ledgerAssets/mould/edit.vue

@@ -48,7 +48,7 @@
               <el-descriptions-item>
                 <template slot="label"> 编号 </template>
                 <el-form-item label-width="0">
-                  <el-input size="small" v-model="info.code1"></el-input>
+                  <el-input size="small" v-model="info.codeNumber"></el-input>
                 </el-form-item>
               </el-descriptions-item>
               <el-descriptions-item>

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

@@ -120,7 +120,7 @@
             minWidth: 110
           },
           {
-            prop: 'code1',
+            prop: 'codeNumber',
             label: '编号',
             showOverflowTooltip: true,
             minWidth: 110

src/views/ledgerAssets/office/edit.vue

@@ -98,7 +98,7 @@
               </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-input size="small" v-model="info.codeNumber"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :md="8" :xs="8" :sm="8">

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

@@ -121,7 +121,7 @@
             minWidth: 110
           },
           {
-            prop: 'code1',
+            prop: 'codeNumber',
             label: '编号',
             showOverflowTooltip: true,
             minWidth: 110

src/views/ledgerAssets/sparepart/edit.vue

@@ -42,7 +42,7 @@
               <el-descriptions-item>
                 <template slot="label"> 编号 </template>
                 <el-form-item label-width="0">
-                  <el-input size="small" v-model="info.code1"></el-input>
+                  <el-input size="small" v-model="info.codeNumber"></el-input>
                 </el-form-item>
               </el-descriptions-item>
               <el-descriptions-item>

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

@@ -114,7 +114,7 @@
             minWidth: 110
           },
           {
-            prop: 'code1',
+            prop: 'codeNumber',
             label: '编号',
             showOverflowTooltip: true,
             minWidth: 110

src/views/ledgerAssets/turnoverCar/edit.vue

@@ -44,7 +44,10 @@
                 <el-descriptions-item>
                   <template slot="label"> 编号 </template>
                   <el-form-item label-width="0">
-                    <el-input class="input" v-model="info.code1"></el-input>
+                    <el-input
+                      class="input"
+                      v-model="info.codeNumber"
+                    ></el-input>
                   </el-form-item>
                 </el-descriptions-item>
                 <el-descriptions-item>