浏览代码

fix: 详情页中的工作流判断

chris 3 年之前
父节点
当前提交
08edd5f68a

+ 1 - 1
src/views/modules/cus/contract-add-or-update.vue

@@ -7,7 +7,7 @@
       :visible.sync="visible">
       <!-- 工作流 -->
       <div v-show="display && dataForm.workFlowBusinessExt">
-        <el-steps :active="dataForm.workFlowBusinessExt?dataForm.workFlowBusinessExt.workFlowProcessStepList.length + 2:0" align-center style="margin-bottom: 20px">
+        <el-steps :active="dataForm.workFlowBusinessExt&&dataForm.workFlowBusinessExt.workFlowProcessStepList?dataForm.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>

+ 1 - 1
src/views/modules/cus/contract-detail.vue

@@ -7,7 +7,7 @@
     <div style="margin-left: 20px;margin-right: 20px">
       <!-- 工作流 -->
       <div v-show="dataForm.workFlowBusinessExt">
-        <el-steps :active="dataForm.workFlowBusinessExt?dataForm.workFlowBusinessExt.workFlowProcessStepList.length + 2:0" align-center style="margin-bottom: 20px">
+        <el-steps :active="dataForm.workFlowBusinessExt&&dataForm.workFlowBusinessExt.workFlowProcessStepList?dataForm.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>

+ 1 - 1
src/views/modules/notice/notice-detail.vue

@@ -7,7 +7,7 @@
     <div style="margin-left: 20px;margin-right: 20px">
       <!-- 工作流 -->
       <div v-show="dataForm.workFlowBusinessExt">
-        <el-steps :active="dataForm.workFlowBusinessExt?dataForm.workFlowBusinessExt.workFlowProcessStepList.length + 2:0" align-center style="margin-bottom: 20px">
+        <el-steps :active="dataForm.workFlowBusinessExt&&dataForm.workFlowBusinessExt.workFlowProcessStepList?dataForm.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>

+ 1 - 1
src/views/modules/order/order-add-or-update.vue

@@ -7,7 +7,7 @@
       :visible.sync="visible">
       <!-- 工作流 -->
       <div v-show="display && dataForm.workFlowBusinessExt">
-        <el-steps :active="dataForm.workFlowBusinessExt?dataForm.workFlowBusinessExt.workFlowProcessStepList.length + 2:0" align-center style="margin-bottom: 20px">
+        <el-steps :active="dataForm.workFlowBusinessExt&&dataForm.workFlowBusinessExt.workFlowProcessStepList?dataForm.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>

+ 5 - 3
src/views/modules/order/order-detail.vue

@@ -7,7 +7,7 @@
     <div style="margin-left: 20px;margin-right: 20px">
       <!-- 工作流 -->
       <div v-show="dataForm.workFlowBusinessExt">
-        <el-steps :active="dataForm.workFlowBusinessExt?dataForm.workFlowBusinessExt.workFlowProcessStepList.length + 2:0" align-center style="margin-bottom: 20px">
+        <el-steps :active="dataForm.workFlowBusinessExt&&dataForm.workFlowBusinessExt.workFlowProcessStepList?dataForm.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>
@@ -32,7 +32,7 @@
         <e-desc-item label="客户名称">{{dataForm.customerName}}</e-desc-item>
 
         <e-desc-item label="业务员">{{dataForm.salesmanName}}</e-desc-item>
-        <e-desc-item label="合同交期" span="2">{{dataForm.contactDate}}</e-desc-item>
+        <e-desc-item label="合同交期" span="2">{{dataForm.contactDate?dataForm.contactDate.substring(0,10):''}}</e-desc-item>
 
         <e-desc-item label="备注说明" span="3">{{dataForm.notes}}</e-desc-item>
       </e-desc>
@@ -144,7 +144,9 @@
         this.visible = true
         this.isFlow = !!(businessType && businessType !== '')
         this.id = id || 0
-        this.dataForm = {}
+        this.dataForm = {
+          workFlowBusinessExt: null
+        }
         this.productDetails = []
         this.stepList = []
         this.logList = []

+ 1 - 1
src/views/modules/sale/purchase-add-or-update.vue

@@ -7,7 +7,7 @@
       :visible.sync="visible">
       <!-- 工作流 -->
       <div v-show="display && dataForm.workFlowBusinessExt">
-        <el-steps :active="dataForm.workFlowBusinessExt?dataForm.workFlowBusinessExt.workFlowProcessStepList.length + 2:0" align-center style="margin-bottom: 20px">
+        <el-steps :active="dataForm.workFlowBusinessExt&&dataForm.workFlowBusinessExt.workFlowProcessStepList?dataForm.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>

+ 1 - 1
src/views/modules/sale/purchase-detail.vue

@@ -7,7 +7,7 @@
     <div style="margin-left: 20px;margin-right: 20px">
       <!-- 工作流 -->
       <div v-show="dataForm.workFlowBusinessExt">
-        <el-steps :active="dataForm.workFlowBusinessExt?dataForm.workFlowBusinessExt.workFlowProcessStepList.length + 2:0" align-center style="margin-bottom: 20px">
+        <el-steps :active="dataForm.workFlowBusinessExt&&dataForm.workFlowBusinessExt.workFlowProcessStepList?dataForm.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>

+ 1 - 1
src/views/modules/tech/crafts-detail.vue

@@ -8,7 +8,7 @@
     <div style="margin-left: 20px;margin-right: 20px">
       <!-- 工作流 -->
       <div v-show="dataForm.workFlowBusinessExt">
-        <el-steps :active="dataForm.workFlowBusinessExt?dataForm.workFlowBusinessExt.workFlowProcessStepList.length + 2:0" align-center style="margin-bottom: 20px">
+        <el-steps :active="dataForm.workFlowBusinessExt&&dataForm.workFlowBusinessExt.workFlowProcessStepList?dataForm.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>

+ 1 - 1
src/views/modules/tech/draw-detail.vue

@@ -7,7 +7,7 @@
     <div style="margin-left: 20px;margin-right: 20px">
       <!-- 工作流 -->
       <div v-show="dataForm.workFlowBusinessExt">
-        <el-steps :active="dataForm.workFlowBusinessExt?dataForm.workFlowBusinessExt.workFlowProcessStepList.length + 2:0" align-center style="margin-bottom: 20px">
+        <el-steps :active="dataForm.workFlowBusinessExt&&dataForm.workFlowBusinessExt.workFlowProcessStepList?dataForm.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>

+ 1 - 1
src/views/modules/tech/product-add-or-update.vue

@@ -7,7 +7,7 @@
         :visible.sync="visible">
         <!-- 工作流 -->
         <div v-show="display && dataForm.workFlowBusinessExt">
-          <el-steps :active="dataForm.workFlowBusinessExt?dataForm.workFlowBusinessExt.workFlowProcessStepList.length + 2:0" align-center style="margin-bottom: 20px">
+          <el-steps :active="dataForm.workFlowBusinessExt&&dataForm.workFlowBusinessExt.workFlowProcessStepList?dataForm.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>

+ 1 - 1
src/views/modules/tech/product-detail.vue

@@ -7,7 +7,7 @@
     <div style="margin-left: 20px;margin-right: 20px">
       <!-- 工作流 -->
       <div v-show="dataForm.workFlowBusinessExt">
-        <el-steps :active="dataForm.workFlowBusinessExt?dataForm.workFlowBusinessExt.workFlowProcessStepList.length + 2:0" align-center style="margin-bottom: 20px">
+        <el-steps :active="dataForm.workFlowBusinessExt&&dataForm.workFlowBusinessExt.workFlowProcessStepList?dataForm.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>

+ 1 - 1
src/views/modules/tech/work-type-detail.vue

@@ -7,7 +7,7 @@
     <div style="margin-left: 20px;margin-right: 20px">
       <!-- 工作流 -->
       <div v-show="dataForm.workFlowBusinessExt">
-        <el-steps :active="dataForm.workFlowBusinessExt?dataForm.workFlowBusinessExt.workFlowProcessStepList.length + 2:0" align-center style="margin-bottom: 20px">
+        <el-steps :active="dataForm.workFlowBusinessExt&&dataForm.workFlowBusinessExt.workFlowProcessStepList?dataForm.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>

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

@@ -7,7 +7,7 @@
     <div style="margin-left: 20px;margin-right: 20px">
       <!-- 工作流 -->
       <div v-show="dataForm.workFlowBusinessExt">
-        <el-steps :active="dataForm.workFlowBusinessExt?dataForm.workFlowBusinessExt.workFlowProcessStepList.length + 2:0" align-center style="margin-bottom: 20px">
+        <el-steps :active="dataForm.workFlowBusinessExt&&dataForm.workFlowBusinessExt.workFlowProcessStepList?dataForm.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>

+ 1 - 1
src/views/modules/warehouse/stock-order-detail.vue

@@ -6,7 +6,7 @@
       :visible.sync="visible">
       <div style="margin-left: 20px;margin-right: 20px">
         <!-- 工作流 -->
-        <div v-show="dataForm.workFlowBusinessExt && dataForm.workFlowBusinessExt.workFlowProcessStepList">
+        <div v-show="dataForm.workFlowBusinessExt">
           <el-steps :active="dataForm.workFlowBusinessExt && dataForm.workFlowBusinessExt.workFlowProcessStepList?dataForm.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>

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

@@ -7,7 +7,7 @@
     <div style="margin-left: 20px;margin-right: 20px">
       <!-- 工作流 -->
       <div v-show="dataForm.workFlowBusinessExt">
-        <el-steps :active="dataForm.workFlowBusinessExt?dataForm.workFlowBusinessExt.workFlowProcessStepList.length + 2:0" align-center style="margin-bottom: 20px">
+        <el-steps :active="dataForm.workFlowBusinessExt&&dataForm.workFlowBusinessExt.workFlowProcessStepList?dataForm.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>