Bug Fix: 054

src/components/work-flow/config/methods.js

@@ -206,7 +206,7 @@ const methods = {
       maxZoom: 2,
       // 设置滚动缩放的组合键，默认不需要组合键
       beforeWheel: e => {
-        console.log(e)
+        // console.log(e)
         // let shouldIgnore = !e.ctrlKey
         // return shouldIgnore
       },

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

@@ -42,7 +42,7 @@
                 <el-option
                   v-for="item in options1"
                   :key="item.value"
-                  :label="item.coCode"
+                  :label="item.coCode + ' (' + item.customerName + ')'"
                   :value="item.coCode">
                 </el-option>
               </el-select>

src/views/modules/msg-center/approve.vue

@@ -93,13 +93,15 @@
         prop="orgName"
         header-align="center"
         align="center"
+        min-width="140"
+        :show-tooltip-when-overflow="true"
         label="申请部门">
       </el-table-column>
       <el-table-column
         prop="completeDate"
         header-align="center"
         align="center"
-        min-width="150"
+        min-width="160"
         :show-tooltip-when-overflow="true"
         label="处理意见">
       </el-table-column>
@@ -111,7 +113,7 @@
         label="操作">
         <template slot-scope="scope">
           <el-button v-if="Number(scope.row.state) !== 3 && checkUser(scope.row)" type="text" size="small" @click="addOrUpdateHandle(scope.row.businessType, scope.row.businessId)">处理</el-button>
-          <el-button v-else type="text" size="small" @click="detailHandle(scope.row.businessType, scope.row.businessId)">查看</el-button>
+          <el-button v-else type="text" size="small" @click="detailHandle(scope.row)">查看</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -132,6 +134,7 @@
 <script>
   import AddOrUpdate from './approve-add-or-update'
   import { getApprovalList } from '@/api/msg'
+  // import { getApprovalList, readNotice } from '@/api/msg'
   import { getCusList } from '@/api/cus'
   import { checkStr } from '@/api/util'
   export default {
@@ -278,11 +281,13 @@
         })
       },
       // 详情
-      detailHandle (businessType, businessId) {
+      detailHandle (row) {
         this.addOrUpdateVisible = true
         this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(businessType, businessId, true)
+          this.$refs.addOrUpdate.init(row.businessType, row.businessId, true)
         })
+        // todo 已查看
+        // readNotice(this, row.noticeId)
       }
     }
   }

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

@@ -8,21 +8,9 @@
     <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.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>
+            <el-step :icon="item.icon" :title="item.title" :description="item.description"></el-step>
           </template>
         </el-steps>
         <el-collapse style="margin-bottom: 20px">
@@ -31,10 +19,7 @@
               <span style="color: red">审批日志（展开查看更多）：</span>
             </template>
             <template v-for="(item, i) in logList">
-              <div>
-                {{ ++i }}：{{ item.approverName }} {{ item.createTime }}
-                {{ item.approvalValue }}
-              </div>
+              <div>{{++i}}：{{item.approverName}}  {{item.createTime}}  {{item.approvalValue}}</div>
             </template>
           </el-collapse-item>
         </el-collapse>
@@ -94,7 +79,9 @@ export default {
       isFlow: false,
       id: 0,
       productName: '',
-      dataForm: {},
+      dataForm: {
+        workFlowBusinessExt: null
+      },
       stepList: [],
       logList: [],
       fileList: [],
@@ -118,7 +105,7 @@ export default {
     },
     getDetails (businessType) {
       getInfo(this.id).then(({ data }) => {
-        if (data && data.code === '200') {
+        if (data && data.code === '200' && data.data) {
           this.dataForm = data.data
           // 流程图展示
           this.workFlowData = {