Browse Source

Fix: 模版问题

liqianyi 3 years ago
parent
commit
213e8247be

+ 1 - 1
src/views/modules/warehouse/inventory-detail.vue

@@ -9,7 +9,7 @@
     <div style="margin-left: 20px;margin-right: 20px">
       <!-- 工作流 -->
       <div v-show="flowVisible">
-        <el-steps :active="flowVisible?dataList[0].workFlowBusinessExt.workFlowProcessStepList.length:0" align-center style="margin-bottom: 20px">
+        <el-steps :active="flowVisible?dataList[0].workFlowBusinessExt.workFlowProcessStepList.length + 2:0" align-center style="margin-bottom: 20px">
           <template v-for="(item, i) in stepList">
             <el-step :icon="item.icon" :title="item.title" :description="item.description"></el-step>
           </template>

+ 11 - 0
src/views/modules/warehouse/template-delivery-detail.vue

@@ -39,6 +39,7 @@
         <el-table
           :data="materialList"
           border
+          :row-style="rowStyle"
           style="width: 100%;">
           <el-table-column
             label="序号"
@@ -166,6 +167,16 @@
       approveFinished () {
         this.onChose()
         this.$emit('approveFinished')
+      },
+      rowStyle ({row, rowIndex}) {
+        let styles = {}
+        if (Number(row.deliveredCnt) < Number(row.cnt)) {
+          styles.background = '#e0838f'
+          styles.color = 'black'
+          return styles
+        } else {
+          return ''
+        }
       }
     }
   }

+ 1 - 1
src/views/modules/warehouse/template-list.vue

@@ -201,7 +201,7 @@
       },
       // 是否产品模板
       formatProduct (row) {
-        return row.productId ? '是' : '否'
+        return row.productId ? '关联' : '非关联'
       },
       // 停用
       async update (templateId, state) {