详情bug修复

src/views/produceOrder/components/bomList.vue

@@ -11,11 +11,13 @@
 </template>
 
 <script>
+  import dictMixins from '@/mixins/dictMixins';
   export default {
+	mixins: [dictMixins],
     data () {
       return {
         visible: false,
-		tableList:[],
+	    	tableList:[],
         columns: [
           {
             label: '序号',
@@ -33,7 +35,10 @@
           },
           {
             label: '类型',
-            prop: 'listType'
+            prop: 'listType',
+			formatter: (_row, _column, cellValue) => {
+			  return this.getDictValue('类型用途', _row.listType);
+			}			
           },
           {
             label: '计量单位',
@@ -46,13 +51,16 @@
         ]
       };
     },
+	created () {
+	  this.requestDict('类型用途');
+	},
     methods: {
       open (row) {
 		if(row){
 			this.tableList = row.materialList
 		}
-        this.visible = true;
-      }
+				this.visible = true;
+		}
     }
   };
 </script>

src/views/produceOrder/detail.vue

@@ -241,6 +241,7 @@
   import OrderPrint from '@/components/print/OrderPrint';
   import bomList from './components/bomList';
   import { getTaskListById } from '@/api/mainData/index.js';
+  import dictMixins from '@/mixins/dictMixins';
   import {
     reportPage,
     getInfoById,
@@ -248,6 +249,7 @@
     writeOffWork
   } from '@/api/produceOrder/index.js';
   export default {
+	mixins: [dictMixins],
     components: {
       OrderPrint,
       otherMission,
@@ -1021,9 +1023,12 @@
             },
             {
               label: '交货仓库',
-              prop: 'deliveryWarehouse',
+              prop: 'storageCode',
               minWidth: 100,
-              align: 'center'
+              align: 'center',
+			  formatter: (_row, _column, cellValue) => {
+			    return this.getDictValue('仓库', _row.storageCode);
+			  }
             },
             {
               label: '操作',
@@ -1057,6 +1062,7 @@
     created () {
       this.workOrderId = this.$route.query.id;
       this.getInfo(this.workOrderId);
+	  this.requestDict('仓库');
     },
     methods: {
       handlePrint () {