设备台账详情修改提交

src/views/documentManagement/certificateManagement/index.vue

@@ -74,7 +74,8 @@
             label: '序号',
             type: 'index',
             width: 55,
-            align: 'center'
+            align: 'center',
+            fixed: 'left'
           },
           {
             label: '证照编号',

src/views/documentManagement/docManagement/index.vue

@@ -37,7 +37,8 @@
             label: '序号',
             type: 'index',
             width: 55,
-            align: 'center'
+            align: 'center',
+            fixed: 'left'
           },
           {
             label: '文档名称',
@@ -68,6 +69,7 @@
           },
           {
             label: '操作',
+            prop: 'action',
             slot: 'action',
             action: 'action'
           }

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

@@ -26,9 +26,7 @@
       </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label"> 采购日期 </template>
-        {{
-          basicInfo.warehouseDetail && basicInfo.warehouseDetail.procurementTime
-        }}
+        {{ info.productTime}}
       </el-descriptions-item>
       <!-- <el-descriptions-item>
         <template slot="label"> 生产日期 </template>
@@ -36,7 +34,7 @@
       </el-descriptions-item> -->
       <el-descriptions-item>
         <template slot="label"> 过保日期 </template>
-        {{ basicInfo.expirationTime }}
+        {{ info.expirationTime }}
       </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label"> 计量单位 </template>
@@ -178,8 +176,8 @@
         prodOpt: [
           { label: '固资编码', key: 'fixCode', value: '' },
           { label: '投产日期', key: 'startUpTime', value: '' },
-          { label: '所属工厂', key: 'factoryName', value: '' },
-          { label: '所属工序', key: 'roteName', value: '' },
+          { label: '所属厂房', key: 'factoryRoomName', value: '' },
+          // { label: '所属工序', key: 'roteName', value: '' },
           { label: '维护部门', key: 'repairGroupName', value: '' },
           { label: '维护人', key: 'repairUserName', value: '' },
           { label: '维护人电话', key: 'repairUserMobile', value: '' },
@@ -231,7 +229,7 @@
       getInfo () {
         getAssetInfo(this.id).then((data) => {
           this.info = data;
-          this.basicInfo = data.category;
+          this.basicInfo = data.category.category;
           if (data.attUrl && data.attUrl.length > 0) {
             // 文档信息
             data.attUrl.forEach((item, index) => {
@@ -242,7 +240,7 @@
           for (const item of this.prodOpt) {
             // 地址
             if (item.key == 'detailLocation') {
-              item.value = data.positionList[0]?.pathName
+              item.value = data.positionList[0]?.pathName +'/'+ data.positionList[0]?.detailPosition
                 // ?.map((i) => i.name)
                 // .join(',');
             } else {
@@ -250,8 +248,10 @@
             }
           }
           // 设备图片
-          if(typeof data.imageUrl !='string' ){
+          if(data.imageUrl.storePath ){
              this.imageUrl  = getImageUrl(data.imageUrl.storePath)
+          }else{
+            this.imageUrl = null
           }
         });
       },

src/views/ledgerAssets/equipment/edit.vue

@@ -189,14 +189,13 @@
                 <el-input v-model="zcInfo.purpose" class="input"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+<!--            <el-col :span="8">
               <el-form-item label="所属工序">
-                <!-- {{ '成型工序' }} -->
                 <WorkingProcedureSelect
                   v-model="zcInfo.roteId"
                 ></WorkingProcedureSelect>
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="8">
               <el-form-item label="品牌">
                 <el-select v-model="zcInfo.brand" placeholder="请选择">