bug修复提交

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

@@ -175,7 +175,7 @@
       return {
         prodOpt: [
           { label: '固资编码', key: 'fixCode', value: '' },
-          { label: '投产日期', key: 'startUpTime', value: '' },
+          { label: '投产日期', key: 'createTime', value: '' },
           { label: '所属厂房', key: 'factoryRoomName', value: '' },
           // { label: '所属工序', key: 'roteName', value: '' },
           { label: '维护部门', key: 'repairGroupName', value: '' },
@@ -187,7 +187,7 @@
           { label: '权属人电话', key: 'ownershipUserMobile', value: '' },
           { label: '品牌', key: 'brand', value: '' },
           { label: '供应商', key: 'supplierName', span: 2, value: '' },
-          { label: '供应商电话', key: 'supplierMobile', value: '' },
+          { label: '供应商电话', key: 'ownershipUserMobile', value: '' },
           { label: '设备用途', key: 'purpose', value: '' },
           { label: '设备位置', key: 'detailLocation', span: 2, value: '' },
           { label: '颜色', key: 'color', value: '' },

src/views/ledgerAssets/equipment/edit.vue

@@ -64,15 +64,15 @@
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label"> 型号</template>
-              {{ basicInfo.modelType }}
+              {{ basicInfo.category&&basicInfo.category.modelType }}
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label"> 规格 </template>
-              {{ basicInfo.specification }}
+              {{ basicInfo.category&&basicInfo.category.specification }}
             </el-descriptions-item>
             <el-descriptions-item :span="2">
               <template slot="label"> 分类 </template>
-              {{ basicInfo.categoryLevelPath }}
+              {{ basicInfo.category&&basicInfo.category.categoryLevelPath }}
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label"> 生产日期 </template>
@@ -99,7 +99,7 @@
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label"> 计量单位 </template>
-              {{ basicInfo.measuringUnit }}
+              {{ basicInfo.category&&basicInfo.category.measuringUnit }}
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label"> 标准产能 </template>
@@ -224,7 +224,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="所属厂房">
-                <FactoryAreaSelect v-model="zcInfo.factoryPlantCode" />
+                <FactoryAreaSelect v-model="zcInfo.factoryRoomId" />
                 <!-- <el-select
                   v-model="zcInfo.factoryPlantCode"
                   placeholder="请选择"
@@ -562,7 +562,7 @@
           // 	供应商code
           supplierId: '',
           // 厂房
-          factoryPlantCode: '',
+          factoryRoomId: '',
           roteCode: ''
         },
         positionInfo: {

src/views/material/product/detail.vue

@@ -315,7 +315,7 @@
         }
       },
       openCategory () {
-        this.$refs.categoryRefs.open(this.form.categoryLevelGroupId);
+        this.$refs.categoryRefs.open(this.form.categoryLevelId);
       },
       cancel () {
         finishPageTab();