审批日志处理

src/api/util.js

@@ -12,8 +12,8 @@ export function dealStepData (list, stepList) {
     list.forEach((item) => {
       stepList.push({
         icon: item.approvalState === '0' ? 'el-icon-location' : 'el-icon-location-outline',
-        title: item.stepName,
-        description: formatStepDesc(item.processLogInfoList)
+        title: item.stepName
+        // description: formatStepDesc(item.processLogInfoList)
       })
     })
     stepList.push({
@@ -22,11 +22,23 @@ export function dealStepData (list, stepList) {
     })
   }
 }
+
+/**
+ * 处理流程图日志数据
+ * @param list 数据来源
+ * @param stepLogList 流程日志数据
+ */
+export function dealStepLogs (list, stepLogList) {
+  if (!list) return
+  list.forEach((item) => {
+    stepLogList.push(item)
+  })
+}
 export function formatStepDesc (lst) {
   if (!lst) return ''
   let str = ''
   lst.forEach((item) => {
-    str = str + '\n' + item.approver + '    ' + item.createTime + '    ' + item.approvalValue
+    str = str + '\n' + item.assigneeName + '    ' + item.createTime + '    ' + item.approvalState
   })
   return str
 }

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

@@ -10,6 +10,16 @@
           <el-step :icon="item.icon" :title="item.title" :description="item.description"></el-step>
         </template>
       </el-steps>
+      <el-collapse v-if="display" style="margin-bottom: 20px">
+        <el-collapse-item>
+          <template slot="title">
+            <span style="color: red">审批日志（展开查看更多）：</span>
+          </template>
+          <template v-for="(item, i) in logList">
+            <div>{{++i}}：{{item.approverName}}  {{item.createTime}}  {{item.approvalValue}}</div>
+          </template>
+        </el-collapse-item>
+      </el-collapse>
       <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="auto">
         <el-row class="my-row">
           <el-col :span="8">
@@ -109,7 +119,7 @@
   import { getCoCode, geTreDetail } from '@/api/cus'
   import { getDictList } from '@/api/dict'
   import { uploadUrl, downloadUrl, uploadFiles } from '@/api/file'
-  import { dealStepData } from '@/api/util'
+  import { dealStepData, dealStepLogs } from '@/api/util'
   export default {
     name: 'stock-order-inbound',
     computed: {
@@ -126,6 +136,7 @@
         dataList: [],
         fileList: [],
         stepList: [],
+        logList: [],
         id: 0,
         dataForm: {
           coCode: '',
@@ -163,6 +174,7 @@
         this.display = disable
         this.fileList = []
         this.stepList = []
+        this.logList = []
         this.visible = true
         this.id = id || 0
         // 获取评审类别
@@ -181,7 +193,8 @@
           if (data && data.code === '200') {
             this.dataForm = data.data
             // 流程图展示
-            dealStepData(data.data.workFlowBusinessExt.processLogList, this.stepList)
+            dealStepData(data.data.workFlowBusinessExt.workFlowProcessStepList, this.stepList)
+            dealStepLogs(data.data.workFlowBusinessExt.processLogList, this.logList)
             // 附件显示
             this.fileList = []
             data.data.attachList.forEach((item) => {

src/views/modules/warehouse/stock-order-inbound.vue

@@ -4,7 +4,7 @@
     width="80%"
     :close-on-click-modal="false"
     :visible.sync="visible">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="auto">
+    <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="auto">
       <el-row class="my-row my-row-1">
         <el-col :span="8">
           <el-form-item label="编码" prop="recordCode">
@@ -27,7 +27,7 @@
         <div :key="index" class="my-line">
           <el-row class="my-row">
             <el-col :span="8">
-              <el-form-item label="名称" prop="materialName">
+              <el-form-item label="名称" prop="materialName" :rules="{required: true, message: '名称不能为空', trigger: 'blur'}">
                 <el-input v-if="display" v-model="item.materialName" :disabled="true"/>
                 <el-select v-else v-model="item.materialId"
                            remote
@@ -46,7 +46,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="8" style="padding-left: 20px">
-              <el-form-item label="类别" prop="categoryName">
+              <el-form-item label="类别" prop="categoryName" :rules="{required: false, message: '类别不能为空', trigger: 'blur'}">
                 <el-input v-model="item.categoryName" :disabled="display" placeholder="类别"></el-input>
               </el-form-item>
             </el-col>
@@ -56,17 +56,17 @@
           </el-row>
           <el-row class="my-row">
             <el-col :span="8">
-              <el-form-item label="单位" prop="unitName">
+              <el-form-item label="单位" prop="unitName" :rules="{required: false, message: '单位不能为空', trigger: 'blur'}">
                 <el-input v-model="item.unitName" :disabled="display" placeholder="单位"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8" style="padding-left: 20px">
-              <el-form-item label="规格" prop="specifications">
+              <el-form-item label="规格" prop="specifications" :rules="{required: false, message: '规格不能为空', trigger: 'blur'}">
                 <el-input v-model="item.specifications" :disabled="display" placeholder="规格"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8" style="padding-left: 20px">
-              <el-form-item label="批次号" prop="batchNumber">
+              <el-form-item label="批次号" prop="batchNumber" :rules="{required: false, message: '批次号不能为空', trigger: 'blur'}">
                 <el-input v-model="item.batchNumber" :disabled="display" placeholder="请填写入库物品（零件）批次"></el-input>
               </el-form-item>
             </el-col>
@@ -74,7 +74,7 @@
           <el-row class="my-row">
             <el-col :span="8">
               <el-form-item label="单价" prop="price">
-                <el-input-number v-model="item.price" :disabled="display" :precision="2" :min="0.00" :step="0.1"></el-input-number>
+                <el-input-number v-model="item.price" :disabled="display" :precision="1" :min="0.0" :step="0.1"></el-input-number>
               </el-form-item>
             </el-col>
             <el-col :span="8" style="padding-left: 20px">
@@ -152,6 +152,7 @@
         dataForm: {},
         dataList: [],
         dataRule: {
+          userId: [{ required: true, message: '请选择入库申请人', trigger: 'blur' }]
         },
         optionsMaterial: [],
         optionsConversion: []