From 675729d7c83c6b550f4571f23f9f3fc6bc5709d3 Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <925258474@qq.com>
Date: Wed, 17 Jul 2024 16:48:41 +0800
Subject: [PATCH] no message

---
 src/api/gd.js                              |  35 ---
 src/api/gdDetail.js                        |  27 ---
 src/views/business-data/gd/index.vue       | 172 ---------------
 src/views/business-data/gdDetail/index.vue | 242 ---------------------
 src/views/business-data/pick/index.vue     |  20 +-
 5 files changed, 11 insertions(+), 485 deletions(-)
 delete mode 100644 src/api/gd.js
 delete mode 100644 src/api/gdDetail.js
 delete mode 100644 src/views/business-data/gd/index.vue
 delete mode 100644 src/views/business-data/gdDetail/index.vue

diff --git a/src/api/gd.js b/src/api/gd.js
deleted file mode 100644
index b4a8c26..0000000
--- a/src/api/gd.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import request from '@/utils/request'
-
-export function add(data) {
-  return request({
-    url: 'api/gd',
-    method: 'post',
-    data
-  })
-}
-
-export function del(ids) {
-  return request({
-    url: 'api/gd/',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/gd',
-    method: 'put',
-    data
-  })
-}
-
-export function queryAllGd(params) {
-  return request({
-    url: 'api/gd/queryAllGd',
-    method: 'get',
-    params
-  })
-}
-
-export default {add, edit, del,queryAllGd}
diff --git a/src/api/gdDetail.js b/src/api/gdDetail.js
deleted file mode 100644
index 050713f..0000000
--- a/src/api/gdDetail.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import request from '@/utils/request'
-
-export function add(data) {
-  return request({
-    url: 'api/gdDetail',
-    method: 'post',
-    data
-  })
-}
-
-export function del(ids) {
-  return request({
-    url: 'api/gdDetail/',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/gdDetail',
-    method: 'put',
-    data
-  })
-}
-
-export default { add, edit, del }
diff --git a/src/views/business-data/gd/index.vue b/src/views/business-data/gd/index.vue
deleted file mode 100644
index 63cf6cc..0000000
--- a/src/views/business-data/gd/index.vue
+++ /dev/null
@@ -1,172 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <div v-if="crud.props.searchToggle">
-        <!-- 搜索 -->
-        <label class="el-form-item-label">工单编号</label>
-        <el-input v-model="query.code" clearable placeholder="工单编号" style="width: 185px;" class="filter-item"
-                  @keyup.enter.native="crud.toQuery"/>
-
-        <label class="el-form-item-label">任务编号</label>
-        <el-input v-model="query.name" clearable placeholder="任务编号" style="width: 185px;" class="filter-item"
-                  @keyup.enter.native="crud.toQuery"/>
-
-        <label class="el-form-item-label">工单状态</label>
-        <el-select v-model="query.status" filterable placeholder="请选择" class="filter-item" style="width: 185px;">
-          <el-option
-            v-for="item in dict.gd_status"
-            :key="item.id"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
-
-        <rrOperation :crud="crud"/>
-      </div>
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" :tableKey="this.$options.name"/>
-      <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
-                 :title="crud.status.title" width="500px">
-        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
-          <el-form-item label="任务编码" prop="name">
-            <el-input v-model="form.name" style="width: 370px;"/>
-          </el-form-item>
-          <el-form-item label="工单编码" prop="code">
-            <el-input v-model="form.code" style="width: 370px;"/>
-          </el-form-item>
-
-          <el-form-item label="工单状态" prop="status">
-            <el-select v-model="form.status" filterable placeholder="请选择" style="width: 370px;">
-              <el-option
-                v-for="item in dict.gd_status"
-                v-if="item.value==='OPEN'"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" height="63vh" size="small" style="width: 100%;"
-                @selection-change="crud.selectionChangeHandler">
-        <el-table-column type="selection" width="55"/>
-        <el-table-column prop="xh" label="序号" type="index" width="50"/>
-        <el-table-column prop="name" label="任务编码"/>
-        <el-table-column prop="code" label="工单编码"/>
-        <el-table-column prop="status" label="工单状态">
-          <template slot-scope="scope">
-            {{ dict.label.gd_status[scope.row.status] }}
-          </template>
-        </el-table-column>
-
-
-        <el-table-column prop="createTime" label="创建时间"/>
-        <el-table-column v-if="checkPer(['admin','gd:edit','gd:del'])" label="操作" align="center">
-          <template slot-scope="scope">
-            <udOperation
-              :data="scope.row"
-              :permission="permission"
-              :showDle="false"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-      <div style="float: right;">
-        <pagination/>
-      </div>
-
-    </div>
-  </div>
-</template>
-
-<script>
-import crudGd from '@/api/gd'
-import CRUD, {presenter, header, form, crud} from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-import pagination from '@crud/Pagination'
-
-const defaultForm = {
-  id: null,
-  createBy: null,
-  updateBy: null,
-  createTime: null,
-  updateTime: null,
-  code: null,
-  name: null,
-  status: null,
-  station: null
-}
-export default {
-  name: 'Gd',
-  components: {pagination, crudOperation, rrOperation, udOperation},
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  dicts: ['gd_status'],
-  cruds() {
-    return CRUD({
-      title: '备料单',
-      url: 'api/gd',
-      idField: 'id',
-      sort: 'id,desc',
-      crudMethod: {...crudGd},
-      optShow: {
-        add: true,
-        edit: false,
-        del: false,
-        reset: true,
-        download: true
-      },
-      queryOnPresenterCreated: true
-    })
-
-  },
-  data() {
-    return {
-      permission: {
-        add: ['admin', 'gd:add'],
-        edit: ['admin', 'gd:edit'],
-        del: ['admin', 'gd:del']
-      },
-      rules: {
-        name: [
-          {required: true, message: '任务编号不能为空', trigger: 'blur'}
-        ],
-        code: [
-          {required: true, message: '工单编号不能为空', trigger: 'blur'}
-        ],
-        status: [
-          {required: true, message: '工单状态不能为空', trigger: 'blur'}
-        ],
-        station: [
-          {required: true, message: '需求工位不能为空', trigger: 'blur'}
-        ]
-      },
-      queryTypeOptions: [
-        {key: 'code', display_name: '工单编号'},
-        {key: 'name', display_name: '任务编号'},
-        {key: 'status', display_name: '工单状态'},
-        {key: 'station', display_name: '需求工位'}
-      ]
-    }
-  },
-  methods: {
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/business-data/gdDetail/index.vue b/src/views/business-data/gdDetail/index.vue
deleted file mode 100644
index 8758b8d..0000000
--- a/src/views/business-data/gdDetail/index.vue
+++ /dev/null
@@ -1,242 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <div v-if="crud.props.searchToggle">
-        <!-- 搜索 -->
-        <label class="el-form-item-label">单品物料</label>
-        <el-input v-model="query.itemCode" clearable placeholder="单品物料" style="width: 140px;" class="filter-item"
-                  @keyup.enter.native="crud.toQuery"/>
-
-        <label class="el-form-item-label">成品物料</label>
-        <el-input v-model="query.bigItemCode" clearable placeholder="成品物料" style="width: 140px;" class="filter-item"
-                  @keyup.enter.native="crud.toQuery"/>
-
-        <label class="el-form-item-label">单据类型</label>
-        <el-select v-model="query.orderType" filterable clearable placeholder="请选择" style="width: 140px;"
-                   class="filter-item">
-          <el-option
-            v-for="item in dict.gd_type"
-            :key="item.id"
-            :label="item.value"
-            :value="item.value"/>
-        </el-select>
-
-        <label class="el-form-item-label">需求工位</label>
-        <el-input v-model="query.station" clearable placeholder="需求工位" style="width: 140px;" class="filter-item"
-                  @keyup.enter.native="crud.toQuery"/>
-
-        <rrOperation :crud="crud"/>
-      </div>
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" :tableKey="this.$options.name"/>
-      <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
-                 :title="crud.status.title" width="500px">
-        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="120px">
-          <el-form-item label="工单编码" prop="gd">
-            <el-select v-model="form.gd" @focus="getGd()" filterable clearable placeholder="请选择"
-                       style="width: 300px;"
-                       class="filter-item">
-              <el-option
-                v-for="gd in gds"
-                :key="gd.id"
-                :label="gd.code"
-                :value="gd"/>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="单品物料" prop="item">
-            <el-select v-model="form.item" @focus="getItem()" filterable clearable placeholder="请选择"
-                       style="width: 300px;"
-                       class="filter-item">
-              <el-option
-                v-for="item in items"
-                :key="item.id"
-                :label="item.code"
-                :value="item"/>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="单品需求数量" prop="itemQty">
-            <el-input class="filter-item" v-model.number="form.itemQty" style="width: 300px;"
-                      oninput="value=value.replace(/^0|[^0-9]/g,'')"
-                      min="1"/>
-          </el-form-item>
-
-          <el-form-item label="成品物料">
-            <el-select v-model="form.bigItem" @focus="getbigItem()" filterable clearable placeholder="请选择"
-                       style="width: 300px;"
-                       class="filter-item">
-              <el-option
-                v-for="bigItem in bigItems"
-                :key="bigItem.id"
-                :label="bigItem.code"
-                :value="bigItem"/>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="总成需求套数">
-            <el-input class="filter-item" v-model="form.bigItemQty" style="width: 300px;"
-                      oninput="value=value.replace(/^0|[^0-9]/g,'')"
-                      min="1"/>
-          </el-form-item>
-
-          <el-form-item label="单据类型" prop="orderType">
-            <el-select v-model="form.orderType" filterable clearable placeholder="请选择" style="width: 300px;"
-                       class="filter-item">
-              <el-option
-                v-for="item in dict.gd_type"
-                :key="item.id"
-                :label="item.value"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="需求工位" prop="station">
-            <el-input v-model="form.station" style="width: 370px;"/>
-          </el-form-item>
-
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" height="63vh" size="small" style="width: 100%;"
-                @selection-change="crud.selectionChangeHandler">
-        <el-table-column type="selection" width="55"/>
-        <el-table-column prop="xh" label="序号" type="index" width="50"/>
-        <el-table-column prop="gd.code" label="工单编码"/>
-        <el-table-column prop="item.code" label="单品物料"/>
-        <el-table-column prop="itemQty" label="单品需求数量"/>
-        <el-table-column prop="bigItem.code" label="成品物料"/>
-        <el-table-column prop="bigItemQty" label="成品需求套数"/>
-        <el-table-column prop="orderType" label="单据类型"/>
-        <el-table-column prop="station" label="需求工位"/>
-        <el-table-column prop="createTime" label="创建时间"/>
-        <el-table-column v-if="checkPer(['admin','gdDetail:edit','gdDetail:del'])" :show-overflow-tooltip="false"
-                         fixed="right" label="操作" align="center">
-          <template slot-scope="scope">
-            <udOperation
-              :data="scope.row"
-              :permission="permission"
-              :showDle="false"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-      <div style="float: right;">
-        <pagination/>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import crudGdDetail from '@/api/gdDetail'
-import CRUD, {presenter, header, form, crud} from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-import pagination from '@crud/Pagination'
-import {getItemsList} from "@/api/item";
-import {queryAllBigItem} from "@/api/bigItem"
-import {queryAllGd} from "@/api/gd"
-
-const defaultForm = {
-  id: null,
-  createBy: null,
-  updateBy: null,
-  createTime: null,
-  updateTime: null,
-  lineNo: null,
-  item: null,
-  itemQty: null,
-  bigItem: null,
-  bigItemQty: null,
-  orderType: null,
-  gd: null
-}
-export default {
-  name: 'GdDetail',
-  components: {pagination, crudOperation, rrOperation, udOperation},
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  dicts: ['gd_type'],
-  cruds() {
-    return CRUD({
-      title: '备料明细',
-      url: 'api/gdDetail',
-      idField: 'id',
-      sort: 'id,desc',
-      crudMethod: {...crudGdDetail},
-      optShow: {
-        add: true,
-        edit: false,
-        del: false,
-        reset: true,
-        download: true
-      },
-      queryOnPresenterCreated: true
-    })
-  },
-  data() {
-    return {
-      items: [],
-      bigItems: [],
-      gds: [],
-      permission: {
-        add: ['admin', 'gdDetail:add'],
-        edit: ['admin', 'gdDetail:edit'],
-        del: ['admin', 'gdDetail:del']
-      },
-      rules: {
-        gd: [
-          {required: true, message: '请选择工单编码', trigger: 'blur'}
-        ],
-        item: [
-          {required: true, message: '请选择单品物料', trigger: 'blur'}
-        ],
-        itemQty: [
-          {required: true, message: '请输入单品需求数量', trigger: 'blur'},
-        ],
-        orderType: [
-          {required: true, message: '请选择单据类型', trigger: 'blur'}
-        ]
-      },
-    }
-  },
-  created() {
-    this.getItem();//获取物料
-    this.getbigItem();//获取成品
-    this.getGd();//获取工单
-  },
-  methods: {
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    },
-    getItem() {
-      getItemsList({enabled: true}).then(res => {
-        this.items = res
-      })
-    },
-    getbigItem() {
-      queryAllBigItem({}).then(res => {
-        this.bigItems = res
-      })
-    },
-    getGd() {
-      queryAllGd({status: 'OPEN'}).then(res => {
-        this.gds = res
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/business-data/pick/index.vue b/src/views/business-data/pick/index.vue
index ab14845..8b4ec12 100644
--- a/src/views/business-data/pick/index.vue
+++ b/src/views/business-data/pick/index.vue
@@ -5,11 +5,11 @@
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
         <label class="el-form-item-label">工单编码</label>
-        <el-input v-model="query.gdCode" clearable placeholder="工单编码" style="width: 185px;" class="filter-item"
+        <el-input v-model="query.gdCode" clearable placeholder="工单编码" style="width: 180px;" class="filter-item"
                   @keyup.enter.native="crud.toQuery"/>
 
         <label class="el-form-item-label">工单状态</label>
-        <el-select v-model="query.status" filterable placeholder="请选择" class="filter-item" style="width: 185px;">
+        <el-select v-model="query.status" filterable placeholder="请选择" class="filter-item" style="width: 180px;">
           <el-option
             v-for="item in dict.pick_status"
             :key="item.id"
@@ -17,6 +17,14 @@
             :value="item.value"/>
         </el-select>
 
+        <label class="el-form-item-label">成品代码/单品代码</label>
+        <el-input v-model="query.cpCodeOrDpCode" clearable placeholder="成品代码/单品代码" style="width: 180px;" class="filter-item"
+                  @keyup.enter.native="crud.toQuery"/>
+
+        <label class="el-form-item-label">需求工位</label>
+        <el-input v-model="query.station" clearable placeholder="需求工位" style="width: 160px;" class="filter-item"
+                  @keyup.enter.native="crud.toQuery"/>
+
 
         <rrOperation :crud="crud"/>
       </div>
@@ -118,7 +126,6 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
-import {queryAllGd} from "@/api/gd";
 import {getItemsList} from "@/api/item";
 import {queryAllBigItem} from "@/api/bigItem";
 
@@ -147,7 +154,7 @@ export default {
       sort: ['lineNo,asc'],
       crudMethod: {...crudPick},
       optShow: {
-        add: true,
+        add: false,
         edit: false,
         del: false,
         reset: true,
@@ -210,11 +217,6 @@ export default {
         });
       })
 
-    },
-    getGd() {
-      queryAllGd({status: 'OPEN'}).then(res => {
-        this.gds = res
-      })
     }
   }