Merge branch 'linwenxin_workOrder' of ssh://gogs.zfire.top:2222/zfire-front/zfire-newmall-admin

src/views/workOrder/workOrderPool/detailModule/OperationDetail/index.vue

@@ -14,6 +14,7 @@
 
 <script>
 import { orderBaseLogList } from "@/api/workOrderPool.js"
+import ImageUpload from '@/components/file-upload'
 export default {
   props: {
     id: {
@@ -21,6 +22,9 @@ export default {
       default: null,
     }
   },
+  components: {
+    ImageUpload
+  },
   data() {
     return {
       logList: []
@@ -48,7 +52,19 @@ export default {
         {
           columnAttributes: {
             label: '操作内容',
-            prop: 'content'
+            prop: 'content',
+          }
+        },
+        {
+          columnAttributes: {
+            label: '附件',
+            prop: 'imgSrc',
+            width: 250
+          },
+          render: (h, { row, column, index }) => {
+            return <div style="padding: 0 10px">
+              <ImageUpload fileList={row.imgSrc ? item.imgSrc.split(",").map(url => ({ url })) : []} limit={100} isEdit={false} />
+            </div>
           }
         },
         {
@@ -88,7 +104,7 @@ export default {
   box-sizing: border-box;
   padding-left: 16px;
 
-  ::v-deep & > .zj-page-fill-scroll {
+  ::v-deep &>.zj-page-fill-scroll {
     box-sizing: border-box;
     padding-right: 16px;
 

src/views/workOrder/workOrderPool/detailModule/workOrderInfo/mixins/dispatchInfo.js

@@ -1,5 +1,6 @@
 import { orderBaseLogList } from "@/api/workOrderPool.js"
 import copyInfo from '../buttons/copyInfo.vue'
+import ImageUpload from '@/components/file-upload'
 export default {
   data() {
     return {
@@ -15,7 +16,20 @@ export default {
         {
           columnAttributes: {
             label: '操作内容',
-            prop: 'content'
+            prop: 'content',
+            width: 200
+          }
+        },
+        {
+          columnAttributes: {
+            label: '附件',
+            prop: 'imgSrc',
+            width: 150
+          },
+          render: (h, { row, column, index }) => {
+            return <div style="padding: 0 10px">
+              <ImageUpload fileList={row.imgSrc ? item.imgSrc.split(",").map(url => ({ url })) : []} limit={100} isEdit={false} />
+            </div>
           }
         },
         {