33

src/components/print/OrderPrint.vue

@@ -243,7 +243,7 @@
                 >物料名称：{{ material.name }}
               </el-col>
               <el-col :span="4" class="border-dashed-right border-dashed-bottom"
-                >物料编号：{{ material.code }}
+                >物料编码：{{ material.code }}
               </el-col>
               <el-col :span="4" class="border-dashed-right border-dashed-bottom"
                 >物料数量：{{ material.number }}

src/views/beEntrusted/components/create.vue

@@ -206,7 +206,7 @@
 
         <el-table-column label="产品名称" align="center" prop="productName">
         </el-table-column>
-        <el-table-column label="产品编号" align="center" prop="productCode">
+        <el-table-column label="产品编码" align="center" prop="productCode">
         </el-table-column>
         <el-table-column label="牌号" align="center" prop="brandNo">
         </el-table-column>

src/views/entrust/components/create.vue

@@ -206,7 +206,7 @@
 
         <el-table-column label="产品名称" align="center" prop="productName">
         </el-table-column>
-        <el-table-column label="产品编号" align="center" prop="productCode">
+        <el-table-column label="产品编码" align="center" prop="productCode">
         </el-table-column>
         <el-table-column label="牌号" align="center" prop="brandNo">
         </el-table-column>

src/views/entrust/components/produceOrder.vue

@@ -93,7 +93,7 @@ export default {
         },
         {
           prop: 'productCode',
-          label: '产品编号',
+          label: '产品编码',
           align: 'center'
         },
         {

src/views/exceptionManagement/components/produceOrder.vue

@@ -93,7 +93,7 @@ export default {
         },
         {
           prop: 'productCode',
-          label: '产品编号',
+          label: '产品编码',
           align: 'center'
         },
         {

src/views/pick/pickApply/components/search.vue

@@ -0,0 +1,84 @@
+<!-- 搜索表单 -->
+<template>
+    <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="领料单:">
+                    <el-input size="mini" clearable v-model="where.workOrderId" placeholder="请输入" />
+                </el-form-item>
+            </el-col>
+
+
+
+            <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+                <el-form-item label="工单号:">
+                    <el-input size="mini"  clearable v-model="where.name" placeholder="请输入" />
+                </el-form-item>
+            </el-col>
+
+
+
+
+            <el-col  v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+                <el-form-item label-width="0px">
+                    <el-button size="mini" type="primary" icon="el-icon-search" class="ele-btn-icon" @click="search">
+                        查询
+                    </el-button>
+                    <el-button size="mini" @click="reset" icon="el-icon-refresh-left" type="primary">重置</el-button>
+                </el-form-item>
+            </el-col>
+        </el-row>
+    </el-form>
+</template>
+
+<script>
+
+export default {
+    props: [],
+    data() {
+        // 默认表单数据
+        const defaultWhere = {
+            workOrderId: '',
+            name: '',
+            code: ''
+
+
+        };
+        return {
+            // 表单数据
+            where: { ...defaultWhere },
+
+        };
+    },
+    computed: {
+        // 是否开启响应式布局
+        styleResponsive() {
+            return this.$store.state.theme.styleResponsive;
+        }
+    },
+    watch: {},
+    created() {
+
+    },
+    methods: {
+        /* 搜索 */
+        search() {
+            this.$emit('search', this.where);
+        },
+        /*  重置 */
+        reset() {
+            this.where = { ...this.defaultWhere };
+            this.search();
+        },
+
+
+    }
+};
+</script>
+<style lang="scss" scoped>
+.ele-form-actions {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+}
+</style>

src/views/pick/pickApply/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="ele-body">
     <el-card shadow="never" v-loading="loading">
+      <search @search="reload" ref="searchRef"></search>
       <ele-pro-table
         ref="table"
         :columns="columns"
@@ -10,8 +11,6 @@
         highlight-current-row
         @refresh="refresh"
       >
-
-
         <template v-slot:status="{ row }">
           <el-tag
             :type="row.status == '0' ? 'danger' : 'success'"
@@ -34,10 +33,13 @@
 
 <script>
   import { getPage } from '@/api/pick/pickApply';
+  import search from './components/search.vue';
 
   export default {
     name: 'pickApply',
-    components: {},
+    components: {
+      search
+    },
     data() {
       return {
         dataList: [],
@@ -57,20 +59,24 @@
             align: 'center',
             showOverflowTooltip: true
           },
+  
           {
-            prop: 'createTime',
-            label: '领料时间',
+            prop: 'code',
+            label: '领料单编号',
             align: 'center'
           },
+
+       
+
           {
-            prop: 'code',
-            label: '领料单编号',
+            prop: '',
+            label: '关联工单编号',
             align: 'center'
           },
 
           {
-            prop: 'name',
-            label: '领料单名称',
+            prop: '',
+            label: '仓库名称',
             align: 'center'
           },
 
@@ -80,6 +86,11 @@
             align: 'center'
           },
 
+          {
+            prop: 'createTime',
+            label: '领料时间',
+            align: 'center'
+          },
           {
             prop: 'status',
             slot: 'status',
@@ -101,17 +112,14 @@
     },
 
     methods: {
-  
-     /* 表格数据源 */
-     datasource({ page, limit, where }) {
+      /* 表格数据源 */
+      datasource({ page, limit, where }) {
         return getPage({
           ...where,
           pageNum: page,
-          size: limit,
+          size: limit
         });
-      },
-
-
+      }
     },
     created() {}
   };

src/views/produceOrder/components/apsPlanOrder.vue

@@ -57,7 +57,7 @@
             prop: 'code'
           },
           {
-            label: '物料编号',
+            label: '物料编码',
             prop: 'productCode'
           },
           {

src/views/produceOrder/components/order-dailog.vue

@@ -77,7 +77,7 @@
           },
           {
             prop: 'productCode',
-            label: '物料编号',
+            label: '物料编码',
             align: 'center'
           },
           {

src/views/produceOrder/index.vue

@@ -299,7 +299,7 @@
           },
           {
             prop: 'productCode',
-            label: '物料编号',
+            label: '物料编码',
             align: 'center'
           },
           {

src/views/produceWord/index.vue

@@ -125,7 +125,7 @@
             minWidth: 100,
           },
 
-          
+
           {
             slot: 'code',
             label: '生产订单号',

src/views/unacceptedProduct/components/create.vue

@@ -71,7 +71,7 @@
 
         <el-table-column label="产品名称" align="center" prop="productName">
         </el-table-column>
-        <el-table-column label="产品编号" align="center" prop="productCode">
+        <el-table-column label="产品编码" align="center" prop="productCode">
         </el-table-column>
         <el-table-column label="牌号" align="center" prop="brandNo">
         </el-table-column>

src/views/unacceptedProduct/components/edit.vue

@@ -4,7 +4,7 @@
     <el-table :data="poList" border>
       <el-table-column label="产品名称" align="center" prop="productName">
       </el-table-column>
-      <el-table-column label="产品编号" align="center" prop="productCode">
+      <el-table-column label="产品编码" align="center" prop="productCode">
       </el-table-column>
       <!-- <el-table-column label="刻码" align="center" prop="engravingCode">
         </el-table-column> -->
@@ -51,7 +51,7 @@
 
         <el-table-column label="产品名称" align="center" prop="productNameNew">
         </el-table-column>
-        <el-table-column label="产品编号" align="center" prop="productCodeNew">
+        <el-table-column label="产品编码" align="center" prop="productCodeNew">
         </el-table-column>
         <!-- <el-table-column label="刻码" align="center" prop="engravingCode">
         </el-table-column> -->