bug修复提交

src/views/ledgerAssets/equipment/edit.vue

@@ -64,15 +64,15 @@
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label"> 型号</template>
-              {{ basicInfo.category&&basicInfo.category.modelType }}
+              {{ assetInfo.modelType }}
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label"> 规格 </template>
-              {{ basicInfo.category&&basicInfo.category.specification }}
+              {{ assetInfo.specification }}
             </el-descriptions-item>
             <el-descriptions-item :span="2">
               <template slot="label"> 分类 </template>
-              {{ basicInfo.category&&basicInfo.category.categoryLevelPath }}
+              {{ assetInfo.categoryLevelPath }}
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label"> 生产日期 </template>
@@ -92,11 +92,11 @@
               </el-form-item>
               <span v-if="pageType == 'edit'">{{ form.productTime }}</span>
             </el-descriptions-item>
-            <el-descriptions-item>
+<!--            <el-descriptions-item>
               <template slot="label"> 过保日期 </template>
               <span v-if="pageType == 'add'">{{ expirationTime }}</span>
               <span v-if="pageType == 'edit'">{{ cbexpirationTime }}</span>
-            </el-descriptions-item>
+            </el-descriptions-item> -->
             <el-descriptions-item>
               <template slot="label"> 计量单位 </template>
               {{ basicInfo.category&&basicInfo.category.measuringUnit }}
@@ -538,6 +538,7 @@
         },
         // 基本信息
         basicInfo: {},
+        assetInfo:{},
         // 资产信息
         zcInfo: {
           // 	固定资产编码
@@ -659,7 +660,7 @@
       },
       async cbDialogGoods (data) {
         this.basicInfo = data;
-        console.log('data',data)
+        this.assetInfo = data
         this.form.rootCategoryLevelId = this.basicInfo.categoryLevelPathId.split(',')[0];
         this.form.categoryId = this.basicInfo.id;
         this.form.name = this.basicInfo.name;
@@ -813,6 +814,7 @@
 
         this.form = data;
         this.basicInfo = data.category;
+        this.assetInfo = data.category.category;
         this.cbexpirationTime = data.expirationTime;
         this.sourceDICT = data.sourceDICT;
         this.networkStatus = data.networkStatus;

src/views/workforceManagement/classes/components/edit.vue

@@ -41,7 +41,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+<!--          <el-col :span="8">
             <el-form-item
               label="日工作时长:"
               prop="totalWorkHour"
@@ -49,7 +49,7 @@
             >
               {{ form.totalWorkHour }} 时
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
       </el-card>
       <el-card

src/views/workforceManagement/classes/components/timeTable.vue

@@ -16,6 +16,7 @@
           icon="el-icon-plus"
           class="ele-btn-icon"
           @click="handlAdd"
+          :disabled="canHandl?true:false"
         >
           新增
         </el-button>
@@ -98,14 +99,14 @@
           </template>
         </el-popconfirm>
 
-        <el-link
+<!--        <el-link
           type="primary"
           :underline="false"
           v-if="!row.isLeader"
           @click="setFirst(row)"
         >
           设为首班
-        </el-link>
+        </el-link> -->
       </template>
     </ele-pro-table>
     <!-- <el-button @click="verification">ada</el-button> -->
@@ -172,9 +173,14 @@
             slot: 'action',
             showOverflowTooltip: true
           }
-        ]
+        ],
       };
     },
+    computed: {
+      canHandl() {
+        return this.form.datasource.length;
+      }
+    },
     methods: {
       remove (row) {
         let index = this.form.datasource.findIndex((n) => n.key == row.key);