Merge remote-tracking branch 'origin/demo_' into demo_

src/views/activiti/task/MyTask.vue

@@ -157,7 +157,11 @@ export default {
       })
     },
     handleChange (record) {
-      this.$refs.assignForm.base(record)
+      fetchCustomFieldTemplateData({ id: record.targetId }).then(res => {
+        record.remark = res.data.remark
+        this.$refs.assignForm.base(record)
+      })
+      //this.$refs.assignForm.base(record)
     },
     handleOk () {
       this.visible = true

src/views/activiti/task/modules/AssignForm.vue

@@ -82,6 +82,7 @@ export default {
           return
         }
         values.taskId = this.record.taskId
+        values.auditModelKey = this.record.remark
         changeSbInfoScrapForAudit(values)
           .then((res) => {
             this.$message.info(res.data)

src/views/sb/scraps/modules/DetailAudit.vue

@@ -43,18 +43,6 @@
       <detail-list-item term="报废原因">{{ model.reason }}</detail-list-item>
       <detail-list-item term="备注">{{ model.dataRemark }}</detail-list-item>
     </detail-list>
-<!--    <detail-list v-show='sbInfoAllocate' title="申请详情附件" :col="2">
-      <detail-list-item term="单号">{{ model.no }}</detail-list-item>
-      <detail-list-item term="设备Id"><a @click="sbIdhandleDetail">{{ model.sbId }}</a></detail-list-item>
-      <detail-list-item term="设备编号">{{ model.sbNo }}</detail-list-item>
-      <detail-list-item term="设备名称">{{ model.sbName }}</detail-list-item>
-      <detail-list-item term="报废原因">{{ model.reason }}</detail-list-item>
-      <detail-list-item term="备注">{{ model.remark }}</detail-list-item>
-      <detail-list-item term="状态">{{ BaseTool.Object.getField(statusMap,model.status) }}</detail-list-item>
-      <detail-list-item term="申请人">{{ model.applyUserId }}</detail-list-item>
-      <detail-list-item term="创建日期">{{ model.createdTime }}</detail-list-item>
-      <detail-list-item term="更新日期">{{ model.updateTime }}</detail-list-item>
-    </detail-list>-->
     <history ref="history" :audit="audit" @ok="handleCancel"></history>
   </a-card>
 </template>