ysy 2 lat temu
rodzic
commit
f0ee236c3a

+ 9 - 9
src/api/saleOrder/index.js

@@ -67,15 +67,15 @@ export async function productionToPlan(data) {
   return Promise.reject(new Error(res.data.message));
 }
 
-// // 生产版本列表
-// export async function versionPage (params) {
-//   let par = new URLSearchParams(params);
-//   const res = await request.get( `/main/produceversion/page?` + par );
-//   if (res.data.code == 0) {
-//     return res.data.data;
-//   }
-//   return Promise.reject(new Error(res.data.message));
-// }
+// 生产版本列表
+export async function versionPage (params) {
+  let par = new URLSearchParams(params);
+  const res = await request.get( `/main/produceversion/page?` + par );
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
 
 // 刷新销售订单
 export async function pullSalesOrder(params) {

+ 6 - 2
src/components/CreatePlan/ProductionVersion2.vue

@@ -2,6 +2,7 @@
   <el-dialog title="选择工艺路线" :visible.sync="visible" :before-close="handleClose" :close-on-click-modal="false"
     :close-on-press-escape="false" append-to-body width="80%">
     <el-card shadow="never">
+      <productionSearch   @search="reload"></productionSearch>
       <ele-pro-table ref="table" :columns="columns" :datasource="datasource" height="calc(100vh - 350px)"
         class="dict-table" @cell-click="cellClick">
         <!-- 表头工具栏 -->
@@ -22,8 +23,11 @@
 
 
 import { routeList } from '@/api/saleOrder';
+import productionSearch from './production-search.vue'
 export default {
-  components: {   },
+  components: { 
+    productionSearch
+    },
   data() {
     return {
       visible: false,
@@ -98,7 +102,7 @@ export default {
     },
 
     /* 刷新表格 */
-    reload() {
+    reload(where) {
       this.$refs.table.reload({ page: 1, where: where });
     },
     open(item) {

+ 102 - 0
src/components/CreatePlan/production-search.vue

@@ -0,0 +1,102 @@
+<!-- 搜索表单 -->
+<template>
+    <el-form
+      label-width="120px"
+      class="ele-form-search"
+      @keyup.enter.native="search"
+      @submit.native.prevent
+    >
+      <el-row>
+        <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
+          <el-form-item label="工艺路线组编码:">
+            <el-input clearable v-model="where.code" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
+        <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
+          <el-form-item label="工艺路线名称:">
+            <el-input clearable v-model="where.name" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
+        <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
+          <el-form-item label="生产版本:">
+            <el-select v-model="where.produceVersionId" filterable placeholder="请选择" :style="{ width: '100%' }">
+                <el-option v-for="item in versionList" :key="item.code" :label="item.code + '-' + item.name"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+          </el-form-item>
+        </el-col>
+
+  
+        <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">
+          <el-form-item label-width="20px">
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              class="ele-btn-icon"
+              @click="search"
+            >
+              查询
+            </el-button>
+            <el-button @click="reset">重置</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </template>
+  
+  <script>
+  import { versionPage } from '@/api/saleOrder';
+    export default {
+      data() {
+        // 默认表单数据
+        const defaultWhere = {
+          code: '',
+          name: '',
+          produceVersionId: ''
+        };
+        return {
+          // 表单数据
+          where: { ...defaultWhere },
+          statusList: [
+            { label: '草稿', value: -1 },
+            { label: '失效', value: 0 },
+            { label: '生效', value: 1 }
+          ],
+  
+          versionList: [],
+        };
+      },
+  
+      created() {
+        this.getVersionList()
+      },
+      computed: {
+        // 是否开启响应式布局
+        styleResponsive() {
+          return this.$store.state.theme.styleResponsive;
+        }
+      },
+      methods: {
+        /* 搜索 */
+        search() {
+          this.$emit('search', this.where);
+        },
+        /*  重置 */
+        reset() {
+          this.where = { ...this.defaultWhere }
+          this.search();
+        },
+  
+        async getVersionList() {
+        const res = await versionPage({
+          pageNum: 1,
+          size: -1
+        });
+  
+        this.versionList = res.list;
+      },
+      }
+    };
+  </script>
+  

+ 6 - 0
src/views/saleOrder/components/plan-submit.vue

@@ -35,6 +35,12 @@
           <template slot="label"> 生产版本 </template>
           {{ info.produceVersionName }}
         </el-descriptions-item>
+
+        <el-descriptions-item>
+          <template slot="label"> 工艺路线 </template>
+          {{ info.produceRoutingName }}
+        </el-descriptions-item>
+
         <el-descriptions-item>
           <template slot="label"> 产品数量 </template>
           {{ info.contractNum }}

+ 1 - 0
src/views/saleOrder/salesToProduction.vue

@@ -483,6 +483,7 @@
       changeProduct(data) {
         this.$set(this.form, 'produceRoutingName', data.name);
         this.$set(this.form, 'produceRoutingId', data.id);
+        this.$set(this.form, 'produceVersionName', data.produceVersionName)
 
       },