ysy 2 лет назад
Родитель
Сommit
0bb8593bab

+ 1 - 7
src/views/outsourcing/index.vue

@@ -98,13 +98,7 @@ export default {
                     align: 'center'
                 },
 
-                {
-                    prop: 'workOrderId',
-                    label: '工单id',
-                    align: 'center'
-                },
-
-
+         
                 {
                     prop: 'workOrderCode',
                     label: '工单编码',

+ 3 - 3
src/views/warehousing/components/search.vue

@@ -3,8 +3,8 @@
     <el-form label-width="90px" class="ele-form-search" @keyup.enter.native="search" @submit.native.prevent>
         <el-row :gutter="15">
             <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-                <el-form-item label="工单Id:">
-                    <el-input clearable v-model="where.workOrderId" placeholder="请输入" />
+                <el-form-item label="工单Code:">
+                    <el-input clearable v-model="where.workOrderCode" placeholder="请输入" />
                 </el-form-item>
             </el-col>
 
@@ -44,7 +44,7 @@ export default {
     data() {
         // 默认表单数据
         const defaultWhere = {
-            workOrderId: '',
+            workOrderCode: '',
             warehouseName: '',
             categoryName: ''
 

+ 52 - 8
src/views/warehousing/components/tgDetails.vue

@@ -1,6 +1,27 @@
 <template>
-  <ele-modal :visible.sync="visible" title="入库详情" width="1200px" >
-    <ele-pro-table :columns="columns" :datasource="tableList" cache-key="tgDetails"  height="calc(100vh - 350px)"	  :need-page="false">
+  <ele-modal :visible.sync="visible" title="入库详情" width="1200px">
+    <ele-pro-table :columns="columns" :datasource="tableList" cache-key="tgDetails" height="calc(100vh - 350px)"
+      :need-page="false">
+
+
+      <template v-slot:materielCode="{ row }">
+                    {{ row.extInfo.materielCode }}
+                </template>
+
+                
+      <template v-slot:clientCode="{ row }">
+                    {{ row.extInfo.clientCode }}
+                </template>
+
+                
+      <template v-slot:engrave="{ row }">
+                    {{ row.extInfo.engrave }}
+                </template>
+
+
+
+
+
     </ele-pro-table>
   </ele-modal>
 </template>
@@ -8,7 +29,7 @@
 <script>
 
 export default {
- 
+
   data() {
     return {
       visible: false,
@@ -20,12 +41,14 @@ export default {
           width: 55,
           align: 'center'
         },
-    
+
         {
           label: '入库申请单id',
           prop: 'applyStorageId'
         },
-    
+
+        
+
         {
           label: '物品名称',
           prop: 'categoryName'
@@ -62,15 +85,36 @@ export default {
 
         {
           label: '包装内总数量',
-          prop: 'quantity	'
+          prop: 'quantity'
         },
 
-    
+
+        {
+          label: '物料代号',
+          slot: 'materielCode'
+        },
+        {
+          label: '客户代号',
+          slot: 'clientCode'
+        },
+        {
+          label: '刻码',
+          slot: 'engrave'
+        },
+        
+        {
+          label: '发货码',
+          prop: 'sendCode'
+        },
+
+
         
 
+
+
       ]
 
-      	
+
     };
   },
   created() {

+ 11 - 11
src/views/warehousing/index.vue

@@ -6,7 +6,7 @@
             <!-- 数据表格 -->
             <ele-pro-table ref="table" :columns="columns" :datasource="datasource" cache-key="workOrderTable">
 
-                
+
 
                 <template v-slot:totalCount="{ row }">
                     {{ row.totalCount }} {{ row.measuringUnit }}
@@ -32,12 +32,12 @@
 
 
                 <template v-slot:action="{ row }">
-      
-            <el-link type="primary" :underline="false" @click="details(row)">
-              详情
-            </el-link>
 
-            </template>
+                    <el-link type="primary" :underline="false" @click="details(row)">
+                        详情
+                    </el-link>
+
+                </template>
 
 
             </ele-pro-table>
@@ -89,8 +89,8 @@ export default {
                     fixed: 'left'
                 },
                 {
-                    prop: 'workOrderId',
-                    label: '工单id',
+                    prop: 'workOrderCode',
+                    label: '工单Code',
                     align: 'center',
                     minWidth: 110
                 },
@@ -168,8 +168,8 @@ export default {
         },
 
 
- 
-  
+
+
     },
     created() {
 
@@ -191,7 +191,7 @@ export default {
 
 
         details(row) {
-      
+
             this.$refs.tgDetailsRefs.open(row)
 
         },