src/api/basicData/Warehouse/StorageBoxInfo.js

@@ -2,47 +2,20 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:00:14
  * @LastEditors: zwq
- * @LastEditTime: 2022-01-17 13:59:54
+ * @LastEditTime: 2022-01-14 16:25:25
  * @Description:
  */
 import request from '@/utils/request'
 
 export function StorageBoxInfoList(data) { // 获取存储箱使用情况
   return request({
-    url: '/api/wms/storage/box/circ/info/his/page/by/code',
+    url: '/api/wms/storage/box/circ/info/page',
     method: 'post',
     data
   })
 }
 
-export function StorageBoxInfoDetail(id) { // 获取存储箱单条数据
+export function StorageBoxInfoDetail(id) { // 获取工厂单条数据
-  const data = {
-    'id': id
-  }
-  return request({
-    url: '/api/wms/storage/box/get',
-    method: 'post',
-    data
-  })
-}
-
-export function StorageBoxRackList(data) { // 获取存储箱上架列表
-  return request({
-    url: '/api/wms/storage/box/circ/info/page/for/bind',
-    method: 'post',
-    data
-  })
-}
-
-export function locationList(data) { // 获取库位列表
-  return request({
-    url: '/api/wms/location/list',
-    method: 'post',
-    data
-  })
-}
-
-export function StorageBoxRackDetail(id) { // 获取存储箱上架单条数据
   const data = {
     'id': id
   }
@@ -53,7 +26,7 @@ export function StorageBoxRackDetail(id) { // 获取存储箱上架单条数据
   })
 }
 
-export function StorageBoxRackUpdate(data) { // 更新存储箱上架单条数据
+export function factoryUpdate(data) { // 更新工厂单条数据
   return request({
     url: '/api/wms/storage/box/circ/info/update',
     method: 'post',
@@ -61,7 +34,7 @@ export function StorageBoxRackUpdate(data) { // 更新存储箱上架单条数
   })
 }
 
-export function StorageBoxRackAdd(data) { // 新增存储箱上架单条数据
+export function factoryAdd(data) { // 新增工厂单条数据
   return request({
     url: '/api/wms/storage/box/circ/info/add',
     method: 'post',
@@ -69,15 +42,14 @@ export function StorageBoxRackAdd(data) { // 新增存储箱上架单条数据
   })
 }
 
-export function StorageBoxRackCode(data) { // 获取存储箱上架code
+export function factoryCode() { // 获取工厂code
   return request({
-    url: '/api/wms/storagebox/page',
+    url: '/api/wms/storage/box/circ/info/get-code',
-    method: 'post',
+    method: 'post'
-    data
   })
 }
 
-export function StorageBoxRackDelete(id) { // 删除存储箱上架单条数据
+export function factoryDelete(id) { // 删除工厂单条数据
   return request({
     url: '/api/wms/storage/box/circ/info/delete',
     method: 'post',

src/api/orderManage/00A.js

@@ -1,47 +0,0 @@
-/*
- * @Author: zwq
- * @Date: 2022-01-17 14:55:09
- * @LastEditors: zwq
- * @LastEditTime: 2022-01-17 14:59:07
- * @Description:
- */
-
-import request from '@/utils/request'
-
-export function ProcessInfoList(data) { // 获取工单工艺列表
-  return request({
-    url: '/api/wms/work/order/page',
-    method: 'post',
-    data
-  })
-}
-
-export function ProcessInfoDetail(id) { // 获取工单工艺单条数据
-  const data = {
-    'id': id
-  }
-  return request({
-    url: '/api/wms/work/order/get',
-    method: 'post',
-    data
-  })
-}
-
-export function ExecutionInfoList(data) { // 获取工单执行列表
-  return request({
-    url: '/api/wms/work/order/execute/page',
-    method: 'post',
-    data
-  })
-}
-
-export function ExecutionInfoDetail(id) { // 获取工单执行单条数据
-  const data = {
-    'id': id
-  }
-  return request({
-    url: '/api/wms/work/order/execute/get',
-    method: 'post',
-    data
-  })
-}

src/filters/basicData/warehouse.js

@@ -1,33 +0,0 @@
-/*
- * @Author: zwq
- * @Date: 2022-01-17 11:30:41
- * @LastEditors: zwq
- * @LastEditTime: 2022-01-17 11:33:29
- * @Description:
- */
-/*
- * @Date: 2020-12-29 16:49:28
- * @LastEditors: gtz
- * @LastEditTime: 2021-04-13 13:49:51
- * @FilePath: \basic-admin\src\filters\DataDict\index.js
- * @Description: 部分常量的数据字典定义
- */
-
-import i18n from '@/lang'
-
-const table = {
-  yesOrNo: {
-    '0': i18n.t('baseDict.yesOrNo.no'),
-    '1': i18n.t('baseDict.yesOrNo.yes')
-  },
-  enableState: {
-    '0': i18n.t('basicDataFilter.enableState.disable'),
-    '1': i18n.t('basicDataFilter.enableState.enable')
-  }
-}
-
-export default function(dictTable) {
-  return function(val) {
-    return table?.[dictTable]?.[val]
-  }
-}

src/lang/i18n/en/module/basicData.js

@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
  * @LastEditors: zwq
- * @LastEditTime: 2022-01-17 15:12:18
+ * @LastEditTime: 2022-01-14 16:34:25
  * @Description: file content
  */
 export default {
@@ -293,16 +293,6 @@ export default {
     TaskLocation: 'Task Location',
     TargetLocation: 'Target Location',
     OrderName: 'Order Name',
-    OrderCode: 'Order Code',
-    IssueOrderTime: 'Issue Order Time',
-    TotalProcessName: 'Total Process Name',
-    Priority: 'Priority',
-    OrderStatus: 'Order Status',
-    ProcessOrNot: 'Process Or Not',
-    Unit: 'Unit',
-    RelateProcess: 'Relate Process',
-    PlanProcessQuantity: 'Plan Process Quantity',
-    SubProcessName: 'Sub Process Name',
     TaskBoxNumber: 'Task Box Number',
     FullBoxNumber: 'Full Box Number',
     EmptyFork: 'Empty Fork',

src/lang/i18n/zh/module/basicData.js

@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
  * @LastEditors: zwq
- * @LastEditTime: 2022-01-17 15:12:12
+ * @LastEditTime: 2022-01-14 16:34:19
  * @Description: file content
  */
 export default {
@@ -293,16 +293,6 @@ export default {
     TaskLocation: '任务库位',
     TargetLocation: '目标库位',
     OrderName: '工单名',
-    OrderCode: '工单编码',
-    IssueOrderTime: '下发工单时间',
-    TotalProcessName: '总工艺名称',
-    Priority: '优先级',
-    OrderStatus: '工单状态',
-    ProcessOrNot: '是否关联工艺',
-    Unit: '单位',
-    RelateProcess: '关联工艺',
-    PlanProcessQuantity: '计划加工数量',
-    SubProcessName: '分工艺',
     TaskBoxNumber: '任务箱号',
     FullBoxNumber: '空箱号',
     EmptyFork: '空箱货叉',

src/views/basicData/Warehouse/StorageBoxInfo.vue

@@ -2,53 +2,51 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-01-17 14:03:24
+ * @LastEditTime: 2022-01-14 16:29:02
  * @Description:
 -->
 <template>
   <div class="app-container">
-    <el-form ref="listQuery" :model="listQuery" :inline="true" label-width="120px" @keyup.enter.native="getList()">
+    <head-form
-      <el-form-item :label="$t('module.basicData.Warehouse.StorageBoxNumber')" prop="code">
+      :placeholder-name="placeholderName"
-        <el-select
+      :key-name="keyName"
-          v-model="listQuery.code"
+      :show-add="false"
-          :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.Warehouse.StorageBoxNumber')])"
+      @getDataList="getList"
-          clearable
+      @add="addNew"
-          filterable
+    />
-          :style="{width: '100%'}"
+    <base-table
-        >
+      :page="listQuery.current"
-          <el-option
+      :limit="listQuery.size"
-            v-for="(item, index) in storageBoxList"
+      :table-config="tableProps"
-            :key="index"
+      :table-data="list"
-            :label="item.code"
+      :is-loading="listLoading"
-            :value="item.code"
+    >
-          />
+      <method-btn
-        </el-select>
+        slot="handleBtn"
-      </el-form-item>
+        :width="trueWidth"
-      <el-form-item>
+        :method-list="tableBtn"
-        <el-button type="primary" @click="getList()">{{ 'btn.search' | i18nFilter }}</el-button>
+        @clickBtn="handleClick"
-      </el-form-item>
-      <base-table
-        :page="listQuery.current"
-        :limit="listQuery.size"
-        :table-config="tableProps"
-        :table-data="list"
-        :is-loading="listLoading"
       />
-      <pagination
+    </base-table>
-        v-show="total > 0"
+    <pagination
-        :total="total"
+      v-show="total > 0"
-        :page.sync="listQuery.current"
+      :total="total"
-        :limit.sync="listQuery.size"
+      :page.sync="listQuery.current"
-        @pagination="getList()"
+      :limit.sync="listQuery.size"
-      />
+      @pagination="getList()"
-    </el-form></div>
+    />
+    <Factory-add v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getList" />
+  </div>
 </template>
 
 <script>
-import { StorageBoxInfoList, StorageBoxRackCode } from '@/api/basicData/Warehouse/StorageBoxInfo'
+import { StorageBoxInfoList } from '@/api/basicData/Warehouse/StorageBoxInfo'
+import FactoryAdd from './components/StorageBoxInfoDetail.vue'
+import HeadForm from '@/components/basicData/HeadForm'
 import BaseTable from '@/components/BaseTable'
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
-import warehouse from '@/filters/basicData/warehouse'
+import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
+import { timeFormatter } from '@/filters'
 import i18n from '@/lang'
 /**
  * 表格表头配置项 TypeScript接口注释
@@ -66,34 +64,39 @@ import i18n from '@/lang'
  *
  */
 
+const tableBtn = [
+  {
+    type: 'see',
+    btnName: 'btn.see'
+  }
+]
 const tableProps = [
   {
     prop: 'code',
     label: i18n.t('module.basicData.Warehouse.StorageBoxNumber'),
+    filter: timeFormatter,
     align: 'center'
   },
   {
     prop: 'status',
     label: i18n.t('module.basicData.Warehouse.BoxStatus'),
-    filter: warehouse('enableState'),
     align: 'center'
   },
   {
-    prop: 'currLocation',
+    prop: 'locationName',
     label: i18n.t('module.basicData.Warehouse.CurrentLocation'),
     align: 'center'
   },
   {
     prop: 'isEmpty',
     label: i18n.t('module.basicData.Warehouse.IsEmpty'),
-    filter: warehouse('yesOrNo'),
     align: 'center'
   }
 ]
 
 export default {
   name: 'StorageBoxInfo',
-  components: { Pagination, BaseTable },
+  components: { Pagination, BaseTable, MethodBtn, HeadForm, FactoryAdd },
   filters: {
     statusFilter(status) {
       const statusMap = {
@@ -108,32 +111,31 @@ export default {
     return {
       keyName: i18n.t('module.basicData.Warehouse.StorageBoxNumber'),
       placeholderName: this.$t('module.basicData.Warehouse.StorageBoxNumber'),
+      addOrUpdateVisible: false,
+      tableBtn,
       trueWidth: 200,
       tableProps,
       list: [],
-      storageBoxList: [],
       total: 0,
       listLoading: true,
       listQuery: {
         current: 1,
         size: 10,
+        name: '',
         code: ''
       }
     }
   },
   created() {
     this.getList()
-    const listQuery1 = {
-      current: 1,
-      size: 100
-    }
-    StorageBoxRackCode(listQuery1).then(res => {
-      this.storageBoxList = res.data.records
-    })
   },
   methods: {
-    getList() {
+    handleClick(raw) {
+      this.addNew(raw.data.id)
+    },
+    getList(key) {
       this.listLoading = true
+      this.listQuery.code = key
       StorageBoxInfoList(this.listQuery).then(response => {
         if (response.data.records) {
           this.list = response.data.records
@@ -143,6 +145,13 @@ export default {
         this.total = response.data.total
         this.listLoading = false
       })
+    },
+    // 新增 / 修改
+    addNew(id) {
+      this.addOrUpdateVisible = true
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(id)
+      })
     }
   }
 }

src/views/basicData/Warehouse/StorageBoxRack.vue

@@ -2,49 +2,17 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-01-17 14:06:53
+ * @LastEditTime: 2022-01-14 16:34:33
  * @Description:
 -->
 <template>
   <div class="app-container">
-    <el-form ref="listQuery" :model="listQuery" :inline="true" label-width="120px" @keyup.enter.native="getList()">
+    <head-form
-      <el-form-item :label="$t('module.basicData.Warehouse.LocationName')" prop="currLocationId">
+      :placeholder-name="placeholderName"
-        <el-select
+      :key-name="keyName"
-          v-model="listQuery.currLocationId"
+      @getDataList="getList"
-          :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.Warehouse.LocationName')])"
+      @add="addNew"
-          clearable
+    />
-          filterable
-          :style="{width: '100%'}"
-        >
-          <el-option
-            v-for="(item, index) in LocationList"
-            :key="index"
-            :label="item.locationName"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="$t('module.basicData.Warehouse.StorageBoxNumber')" prop="storageBoxId">
-        <el-select
-          v-model="listQuery.storageBoxId"
-          :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.Warehouse.StorageBoxNumber')])"
-          clearable
-          filterable
-          :style="{width: '100%'}"
-        >
-          <el-option
-            v-for="(item, index) in storageBoxList"
-            :key="index"
-            :label="item.code"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="getList()">{{ 'btn.search' | i18nFilter }}</el-button>
-        <el-button type="primary" @click="addNew()">{{ 'btn.add' | i18nFilter }}</el-button>
-      </el-form-item>
-    </el-form>
     <base-table
       :page="listQuery.current"
       :limit="listQuery.size"
@@ -71,13 +39,13 @@
 </template>
 
 <script>
-import { StorageBoxRackList, StorageBoxRackDelete, StorageBoxRackCode, locationList } from '@/api/basicData/Warehouse/StorageBoxInfo'
+import { StorageBoxInfoList } from '@/api/basicData/Warehouse/StorageBoxInfo'
-import FactoryAdd from './components/StorageBoxRack-add.vue'
+import FactoryAdd from './components/StorageBoxInfoDetail.vue'
+import HeadForm from '@/components/basicData/HeadForm'
 import BaseTable from '@/components/BaseTable'
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
 import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
 import { timeFormatter } from '@/filters'
-import warehouse from '@/filters/basicData/warehouse'
 import i18n from '@/lang'
 /**
  * 表格表头配置项 TypeScript接口注释
@@ -97,12 +65,8 @@ import i18n from '@/lang'
 
 const tableBtn = [
   {
-    type: 'edit',
+    type: 'see',
-    btnName: 'btn.edit'
+    btnName: 'btn.see'
-  },
-  {
-    type: 'delete',
-    btnName: 'btn.delete'
   }
 ]
 const tableProps = [
@@ -115,35 +79,34 @@ const tableProps = [
   {
     prop: 'code',
     label: i18n.t('module.basicData.Warehouse.StorageBoxNumber'),
+    filter: timeFormatter,
     align: 'center'
   },
   {
     prop: 'status',
     label: i18n.t('module.basicData.Warehouse.BoxStatus'),
-    filter: warehouse('enableState'),
     align: 'center'
   },
   {
-    prop: 'currLocation',
+    prop: 'locationName',
     label: i18n.t('module.basicData.Warehouse.LocationName'),
     align: 'center'
   },
   {
-    prop: 'currLocationName',
+    prop: 'locationCode',
     label: i18n.t('module.basicData.Warehouse.LocationCode'),
     align: 'center'
   },
   {
     prop: 'isEmpty',
     label: i18n.t('module.basicData.Warehouse.IsEmptyBox'),
-    filter: warehouse('yesOrNo'),
     align: 'center'
   }
 ]
 
 export default {
   name: 'StorageBoxInfo',
-  components: { Pagination, BaseTable, MethodBtn, FactoryAdd },
+  components: { Pagination, BaseTable, MethodBtn, HeadForm, FactoryAdd },
   filters: {
     statusFilter(status) {
       const statusMap = {
@@ -164,57 +127,26 @@ export default {
       tableProps,
       list: [],
       total: 0,
-      LocationList: [],
-      storageBoxList: [],
       listLoading: true,
       listQuery: {
         current: 1,
         size: 10,
-        storageBoxId: '',
+        name: '',
-        currLocationId: ''
+        code: ''
       }
     }
   },
   created() {
     this.getList()
-    const listQuery1 = {
-      current: 1,
-      size: 100
-    }
-    locationList(listQuery1).then(response => {
-      this.LocationList = response.data
-    })
-    StorageBoxRackCode(listQuery1).then(res => {
-      this.storageBoxList = res.data.records
-    })
   },
   methods: {
     handleClick(raw) {
-      console.log(raw)
+      this.addNew(raw.data.id)
-      if (raw.type === 'delete') {
-        this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.code}]?`, this.$t('module.basicData.visual.Tips'), {
-          confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
-          cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
-          type: 'warning'
-        }).then(() => {
-          StorageBoxRackDelete(raw.data.id).then(response => {
-            this.$message({
-              message: this.$t('module.basicData.visual.success'),
-              type: 'success',
-              duration: 1500,
-              onClose: () => {
-                this.getList()
-              }
-            })
-          })
-        }).catch(() => {})
-      } else {
-        this.addNew(raw.data.id)
-      }
     },
-    getList() {
+    getList(key) {
       this.listLoading = true
-      StorageBoxRackList(this.listQuery).then(response => {
+      this.listQuery.code = key
+      StorageBoxInfoList(this.listQuery).then(response => {
         if (response.data.records) {
           this.list = response.data.records
         } else {

src/views/basicData/Warehouse/components/StorageBoxInfoDetail.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: zwq
- * @LastEditTime: 2022-01-17 10:19:45
+ * @LastEditTime: 2021-04-12 16:24:32
  * @Description:
 -->
 <template>
@@ -10,7 +10,7 @@
     :title="!dataForm.id ? 'btn.add' : 'btn.edit' | i18nFilter"
     :visible.sync="visible"
   >
-    <el-form ref="dataForm" :model="dataForm" label-width="120px">
+    <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="120px" @keyup.enter.native="dataFormSubmit()">
       <el-form-item :label="$t('module.basicData.factory.FactoryName')" prop="name">
         <el-input v-model="dataForm.name" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.factory.FactoryName')])" clearable />
       </el-form-item>
@@ -26,12 +26,13 @@
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
+      <el-button type="primary" @click="dataFormSubmit()">{{ 'btn.confirm' | i18nFilter }}</el-button>
     </span>
   </el-dialog>
 </template>
 
 <script>
-import { StorageBoxInfoDetail } from '@/api/basicData/Warehouse/StorageBoxInfo'
+import { factoryDetail, factoryUpdate, factoryAdd, factoryCode } from '@/api/basicData/FactoryManagement/factory'
 
 export default {
   data() {
@@ -43,6 +44,20 @@ export default {
         code: '',
         address: '',
         description: ''
+      },
+      dataRule: {
+        name: [
+          {
+            required: true,
+            message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.factory.FactoryName')]),
+            trigger: 'blur' }
+        ],
+        code: [
+          {
+            required: true,
+            message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.factory.FactoryCode')]),
+            trigger: 'blur' }
+        ]
       }
     }
   },
@@ -52,12 +67,57 @@ export default {
       this.visible = true
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
-        StorageBoxInfoDetail(this.dataForm.id).then(res => {
+        if (this.dataForm.id) {
-          this.dataForm.name = res.data.name
+          factoryDetail(this.dataForm.id).then(res => {
-          this.dataForm.code = res.data.code
+            this.dataForm.name = res.data.name
-          this.dataForm.address = res.data.address
+            this.dataForm.code = res.data.code
-          this.dataForm.description = res.data.description
+            this.dataForm.address = res.data.address
-        })
+            this.dataForm.description = res.data.description
+          })
+        } else {
+          factoryCode().then(res => {
+            this.dataForm.code = res.data
+          })
+        }
+      })
+    },
+    // 表单提交
+    dataFormSubmit() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          const data = {
+            'name': this.dataForm.name,
+            'code': this.dataForm.code,
+            'address': this.dataForm.address,
+            'description': this.dataForm.description,
+            'id': this.dataForm.id
+          }
+          if (this.dataForm.id) {
+            factoryUpdate(data).then(res => {
+              this.$message({
+                message: this.$t('module.basicData.visual.success'),
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                  this.visible = false
+                  this.$emit('refreshDataList')
+                }
+              })
+            })
+          } else {
+            factoryAdd(data).then(res => {
+              this.$message({
+                message: this.$t('module.basicData.visual.success'),
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                  this.visible = false
+                  this.$emit('refreshDataList')
+                }
+              })
+            })
+          }
+        }
       })
     }
   }

src/views/basicData/Warehouse/components/StorageBoxRack-add.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: zwq
- * @LastEditTime: 2022-01-17 11:21:26
+ * @LastEditTime: 2021-04-12 16:24:32
  * @Description:
 -->
 <template>
@@ -11,57 +11,17 @@
     :visible.sync="visible"
   >
     <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="120px" @keyup.enter.native="dataFormSubmit()">
-      <el-form-item :label="$t('module.basicData.Warehouse.LocationName')" prop="currLocationId">
+      <el-form-item :label="$t('module.basicData.factory.FactoryName')" prop="name">
-        <el-select
+        <el-input v-model="dataForm.name" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.factory.FactoryName')])" clearable />
-          v-model="dataForm.currLocationId"
-          :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.Warehouse.LocationName')])"
-          clearable
-          filterable
-          :style="{width: '100%'}"
-          @change="selectGetLabel1"
-        >
-          <el-option
-            v-for="(item, index) in LocationList"
-            :key="index"
-            :label="item.locationName"
-            :value="item.id"
-          />
-        </el-select>
       </el-form-item>
-      <el-form-item :label="$t('module.basicData.Warehouse.StorageBoxNumber')" prop="storageBoxId">
+      <el-form-item :label="$t('module.basicData.factory.FactoryCode')" prop="code">
-        <el-select
+        <el-input v-model="dataForm.code" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.factory.FactoryCode')])" clearable />
-          v-model="dataForm.storageBoxId"
-          :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.Warehouse.StorageBoxNumber')])"
-          clearable
-          filterable
-          :style="{width: '100%'}"
-          @change="selectGetLabel2"
-        >
-          <el-option
-            v-for="(item, index) in storageBoxList"
-            :key="index"
-            :label="item.code"
-            :value="item.id"
-          />
-        </el-select>
       </el-form-item>
-      <el-form-item :label="$t('module.basicData.Warehouse.BoxStatus')" prop="status">
+      <el-form-item :label="$t('module.basicData.factory.Address')" prop="address">
-        <el-switch
+        <el-input v-model="dataForm.address" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.factory.Address')])" clearable />
-          v-model="dataForm.status"
-          :active-value="1"
-          :inactive-value="0"
-          active-color="#13ce66"
-          inactive-color="#AAAAAA"
-        />
       </el-form-item>
-      <el-form-item :label="$t('module.basicData.Warehouse.IsEmptyBox')" prop="isEmpty">
+      <el-form-item :label="$t('module.basicData.visual.Remarks')" prop="description">
-        <el-switch
+        <el-input v-model="dataForm.description" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Remarks')])" clearable />
-          v-model="dataForm.isEmpty"
-          :active-value="1"
-          :inactive-value="0"
-          active-color="#13ce66"
-          inactive-color="#AAAAAA"
-        />
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -72,7 +32,7 @@
 </template>
 
 <script>
-import { StorageBoxRackDetail, StorageBoxRackUpdate, StorageBoxRackAdd, StorageBoxRackCode, locationList } from '@/api/basicData/Warehouse/StorageBoxInfo'
+import { factoryDetail, factoryUpdate, factoryAdd, factoryCode } from '@/api/basicData/FactoryManagement/factory'
 
 export default {
   data() {
@@ -80,26 +40,22 @@ export default {
       visible: false,
       dataForm: {
         id: 0,
+        name: '',
         code: '',
-        locationName: '',
+        address: '',
-        currLocationId: '',
+        description: ''
-        storageBoxId: '',
-        status: '',
-        isEmpty: ''
       },
-      LocationList: [],
-      storageBoxList: [],
       dataRule: {
-        currLocationId: [
+        name: [
           {
             required: true,
-            message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.Warehouse.LocationName')]),
+            message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.factory.FactoryName')]),
             trigger: 'blur' }
         ],
-        storageBoxId: [
+        code: [
           {
             required: true,
-            message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.Warehouse.StorageBoxNumber')]),
+            message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.factory.FactoryCode')]),
             trigger: 'blur' }
         ]
       }
@@ -109,46 +65,35 @@ export default {
     init(id) {
       this.dataForm.id = id || ''
       this.visible = true
-      const listQuery = {
-        current: 1,
-        size: 100
-      }
-      locationList(listQuery).then(response => {
-        this.LocationList = response.data
-      })
-      StorageBoxRackCode(listQuery).then(res => {
-        this.storageBoxList = res.data.records
-      })
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
-          StorageBoxRackDetail(this.dataForm.id).then(res => {
+          factoryDetail(this.dataForm.id).then(res => {
-            this.dataForm = res.data
+            this.dataForm.name = res.data.name
+            this.dataForm.code = res.data.code
+            this.dataForm.address = res.data.address
+            this.dataForm.description = res.data.description
+          })
+        } else {
+          factoryCode().then(res => {
+            this.dataForm.code = res.data
           })
         }
       })
     },
-    selectGetLabel1(vId) {
-      let obj = {}
-      obj = this.LocationList.find((item) => {
-        return item.id === vId
-      })
-      this.dataForm.locationName = obj.locationName
-    },
-    selectGetLabel2(vId) {
-      let obj = {}
-      obj = this.storageBoxList.find((item) => {
-        return item.id === vId
-      })
-      this.dataForm.code = obj.code
-    },
     // 表单提交
     dataFormSubmit() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          const data = this.dataForm
+          const data = {
+            'name': this.dataForm.name,
+            'code': this.dataForm.code,
+            'address': this.dataForm.address,
+            'description': this.dataForm.description,
+            'id': this.dataForm.id
+          }
           if (this.dataForm.id) {
-            StorageBoxRackUpdate(data).then(res => {
+            factoryUpdate(data).then(res => {
               this.$message({
                 message: this.$t('module.basicData.visual.success'),
                 type: 'success',
@@ -160,7 +105,7 @@ export default {
               })
             })
           } else {
-            StorageBoxRackAdd(data).then(res => {
+            factoryAdd(data).then(res => {
               this.$message({
                 message: this.$t('module.basicData.visual.success'),
                 type: 'success',

src/views/orderManage/ExecutionInfo.vue

@@ -1,174 +1,7 @@
 <!--
  * @Author: zwq
- * @Date: 2020-12-29 15:41:11
+ * @Date: 2022-01-14 16:40:26
  * @LastEditors: zwq
- * @LastEditTime: 2022-01-17 15:00:35
+ * @LastEditTime: 2022-01-14 16:40:27
  * @Description:
 -->
-<template>
-  <div class="app-container">
-    <head-form
-      :placeholder-name="placeholderName"
-      :key-name="keyName"
-      :show-add="false"
-      @getDataList="getList"
-      @add="addNew"
-    />
-    <base-table
-      :page="listQuery.current"
-      :limit="listQuery.size"
-      :table-config="tableProps"
-      :table-data="list"
-      :is-loading="listLoading"
-    >
-      <method-btn
-        slot="handleBtn"
-        :width="trueWidth"
-        :method-list="tableBtn"
-        @clickBtn="handleClick"
-      />
-    </base-table>
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="listQuery.current"
-      :limit.sync="listQuery.size"
-      @pagination="getList()"
-    />
-    <Factory-add v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getList" />
-  </div>
-</template>
-
-<script>
-import { ExecutionInfoList } from '@/api/orderManage/00A'
-import FactoryAdd from './components/ExecutionInfoDetail.vue'
-import HeadForm from '@/components/basicData/HeadForm'
-import BaseTable from '@/components/BaseTable'
-import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
-import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
-import { timeFormatter } from '@/filters'
-import i18n from '@/lang'
-/**
- * 表格表头配置项 TypeScript接口注释
- * tableConfig<ConfigItem> = []
- *
- * Interface ConfigItem = {
- *  prop: string,
- *  label: string,
- *  width: string,
- *  align: string,
- *  subcomponent: function,
- *  filter: function
- * }
- *
- *
- */
-
-const tableBtn = [
-  {
-    type: 'see',
-    btnName: 'btn.see'
-  }
-]
-const tableProps = [
-  {
-    prop: 'name',
-    label: i18n.t('module.basicData.Warehouse.OrderName'),
-    align: 'center'
-  },
-  {
-    prop: 'createTime',
-    label: i18n.t('module.basicData.Warehouse.IssueOrderTime'),
-    filter: timeFormatter,
-    align: 'center'
-  },
-  {
-    prop: 'craftName',
-    label: i18n.t('module.basicData.Warehouse.TotalProcessName'),
-    align: 'center'
-  },
-  {
-    prop: 'priority',
-    label: i18n.t('module.basicData.Warehouse.Priority'),
-    align: 'center'
-  },
-  {
-    prop: 'status',
-    label: i18n.t('module.basicData.Warehouse.OrderStatus'),
-    align: 'center'
-  }
-]
-
-export default {
-  name: 'ExecutionInfo',
-  components: { Pagination, BaseTable, MethodBtn, HeadForm, FactoryAdd },
-  filters: {
-    statusFilter(status) {
-      const statusMap = {
-        published: 'success',
-        draft: 'info',
-        deleted: 'danger'
-      }
-      return statusMap[status]
-    }
-  },
-  data() {
-    return {
-      keyName: i18n.t('module.basicData.Warehouse.OrderName'),
-      placeholderName: this.$t('module.basicData.Warehouse.OrderName'),
-      addOrUpdateVisible: false,
-      tableBtn,
-      trueWidth: 200,
-      tableProps,
-      list: [],
-      total: 0,
-      listLoading: true,
-      listQuery: {
-        current: 1,
-        size: 10,
-        name: '',
-        code: ''
-      }
-    }
-  },
-  created() {
-    this.getList()
-  },
-  methods: {
-    handleClick(raw) {
-      this.addNew(raw.data.id)
-    },
-    getList(key) {
-      this.listLoading = true
-      this.listQuery.code = key
-      ExecutionInfoList(this.listQuery).then(response => {
-        if (response.data.records) {
-          this.list = response.data.records
-        } else {
-          this.list.splice(0, this.list.length)
-        }
-        this.total = response.data.total
-        this.listLoading = false
-      })
-    },
-    // 新增 / 修改
-    addNew(id) {
-      this.addOrUpdateVisible = true
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(id)
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-.edit-input {
-  padding-right: 100px;
-}
-.cancel-btn {
-  position: absolute;
-  right: 15px;
-  top: 10px;
-}
-</style>

src/views/orderManage/ProcessInfo.vue

@@ -1,181 +1,7 @@
 <!--
  * @Author: zwq
- * @Date: 2020-12-29 15:41:11
+ * @Date: 2022-01-14 16:37:39
  * @LastEditors: zwq
- * @LastEditTime: 2022-01-17 15:12:20
+ * @LastEditTime: 2022-01-14 16:37:39
  * @Description:
 -->
-<template>
-  <div class="app-container">
-    <head-form
-      :placeholder-name="placeholderName"
-      :key-name="keyName"
-      :show-add="false"
-      @getDataList="getList"
-      @add="addNew"
-    />
-    <base-table
-      :page="listQuery.current"
-      :limit="listQuery.size"
-      :table-config="tableProps"
-      :table-data="list"
-      :is-loading="listLoading"
-    >
-      <method-btn
-        slot="handleBtn"
-        :width="trueWidth"
-        :method-list="tableBtn"
-        @clickBtn="handleClick"
-      />
-    </base-table>
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="listQuery.current"
-      :limit.sync="listQuery.size"
-      @pagination="getList()"
-    />
-    <Factory-add v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getList" />
-  </div>
-</template>
-
-<script>
-import { ProcessInfoList } from '@/api/orderManage/00A'
-import FactoryAdd from './components/ProcessInfoDetail.vue'
-import HeadForm from '@/components/basicData/HeadForm'
-import BaseTable from '@/components/BaseTable'
-import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
-import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
-import { timeFormatter } from '@/filters'
-import processLinkBtn from './components/processLinkBtn'
-import i18n from '@/lang'
-/**
- * 表格表头配置项 TypeScript接口注释
- * tableConfig<ConfigItem> = []
- *
- * Interface ConfigItem = {
- *  prop: string,
- *  label: string,
- *  width: string,
- *  align: string,
- *  subcomponent: function,
- *  filter: function
- * }
- *
- *
- */
-
-const tableBtn = [
-  {
-    type: 'see',
-    btnName: 'btn.see'
-  }
-]
-const tableProps = [
-  {
-    prop: 'name',
-    label: i18n.t('module.basicData.Warehouse.OrderName'),
-    align: 'center'
-  },
-  {
-    prop: 'createTime',
-    label: i18n.t('module.basicData.Warehouse.IssueOrderTime'),
-    filter: timeFormatter,
-    align: 'center'
-  },
-  {
-    prop: 'craftName',
-    label: i18n.t('module.basicData.Warehouse.TotalProcessName'),
-    align: 'center'
-  },
-  {
-    prop: 'priority',
-    label: i18n.t('module.basicData.Warehouse.Priority'),
-    align: 'center'
-  },
-  {
-    prop: 'status',
-    label: i18n.t('module.basicData.Warehouse.OrderStatus'),
-    align: 'center'
-  },
-  {
-    prop: 'attribute',
-    label: i18n.t('module.basicData.Warehouse.RelateProcess'),
-    subcomponent: processLinkBtn,
-    align: 'center'
-  }
-]
-
-export default {
-  name: 'ProcessInfo',
-  components: { Pagination, BaseTable, MethodBtn, HeadForm, FactoryAdd },
-  filters: {
-    statusFilter(status) {
-      const statusMap = {
-        published: 'success',
-        draft: 'info',
-        deleted: 'danger'
-      }
-      return statusMap[status]
-    }
-  },
-  data() {
-    return {
-      keyName: i18n.t('module.basicData.Warehouse.OrderName'),
-      placeholderName: this.$t('module.basicData.Warehouse.OrderName'),
-      addOrUpdateVisible: false,
-      tableBtn,
-      trueWidth: 200,
-      tableProps,
-      list: [],
-      total: 0,
-      listLoading: true,
-      listQuery: {
-        current: 1,
-        size: 10,
-        name: '',
-        code: ''
-      }
-    }
-  },
-  created() {
-    this.getList()
-  },
-  methods: {
-    handleClick(raw) {
-      this.addNew(raw.data.id)
-    },
-    getList(key) {
-      this.listLoading = true
-      this.listQuery.code = key
-      ProcessInfoList(this.listQuery).then(response => {
-        if (response.data.records) {
-          this.list = response.data.records
-        } else {
-          this.list.splice(0, this.list.length)
-        }
-        this.total = response.data.total
-        this.listLoading = false
-      })
-    },
-    // 新增 / 修改
-    addNew(id) {
-      this.addOrUpdateVisible = true
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(id)
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-.edit-input {
-  padding-right: 100px;
-}
-.cancel-btn {
-  position: absolute;
-  right: 15px;
-  top: 10px;
-}
-</style>

src/views/orderManage/components/ExecutionInfoDetail.vue

@@ -1,116 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2020-12-29 16:37:56
- * @LastEditors: zwq
- * @LastEditTime: 2022-01-17 15:04:42
- * @Description:
--->
-<template>
-  <el-dialog
-    :title="'btn.see' | i18nFilter"
-    :visible.sync="visible"
-  >
-    <el-row :gutter="10">
-      <el-form
-        ref="dataForm"
-        :model="dataForm"
-        :rules="rules"
-        size="medium"
-        label-width="110px"
-        label-position="left"
-      >
-        <el-col :span="8">
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.OrderName')" prop="name">
-                <el-input v-model="dataForm.name" :placeholder="$i18nForm([$t('module.basicData.Warehouse.OrderName')])" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.IssueOrderTime')" prop="createTime">
-                <el-input v-model="dataForm.createTime" :placeholder="$i18nForm([$t('module.basicData.Warehouse.IssueOrderTime')])" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.PlanProcessQuantity')" prop="planQuantity">
-                <el-input v-model="dataForm.planQuantity" :placeholder="$i18nForm([$t('module.basicData.Warehouse.PlanProcessQuantity')])" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="8">
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.OrderCode')" prop="taskCode">
-                <el-input v-model="dataForm.taskCode" :placeholder="$i18nForm([$t('module.basicData.Warehouse.OrderCode')])" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.OrderStatus')" prop="taskType">
-                <el-input v-model="dataForm.taskType" :placeholder="$i18nForm([$t('module.basicData.Warehouse.OrderStatus')])" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="8">
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.TotalProcessName')" prop="craftName">
-                <el-input v-model="dataForm.craftName" :placeholder="$i18nForm([$t('module.basicData.Warehouse.TotalProcessName')])" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.SubProcessName')" prop="subProccessName">
-                <el-input
-                  v-model="dataForm.subProccessName"
-                  :placeholder="$i18nForm([$t('module.basicData.Warehouse.SubProcessName')])"
-                  readonly
-                  :style="{width: '100%'}"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-col>
-      </el-form>
-    </el-row>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-import { ExecutionInfoDetail } from '@/api/orderManage/00A'
-
-export default {
-  data() {
-    return {
-      visible: false,
-      dataForm: {
-        id: 0,
-        name: undefined,
-        createTime: undefined,
-        taskCode: undefined,
-        taskType: undefined,
-        craftName: undefined,
-        planQuantity: undefined,
-        subProccessName: undefined
-      }
-    }
-  },
-  methods: {
-    init(id) {
-      this.dataForm.id = id || ''
-      this.visible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-        if (this.dataForm.id) {
-          ExecutionInfoDetail(this.dataForm.id).then(res => {
-            this.dataForm = res.data
-          })
-        }
-      })
-    }
-  }
-}
-</script>

src/views/orderManage/components/ProcessInfoDetail.vue

@@ -1,116 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2020-12-29 16:37:56
- * @LastEditors: zwq
- * @LastEditTime: 2022-01-17 15:04:50
- * @Description:
--->
-<template>
-  <el-dialog
-    :title="'btn.see' | i18nFilter"
-    :visible.sync="visible"
-  >
-    <el-row :gutter="10">
-      <el-form
-        ref="dataForm"
-        :model="dataForm"
-        :rules="rules"
-        size="medium"
-        label-width="110px"
-        label-position="left"
-      >
-        <el-col :span="8">
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.OrderName')" prop="name">
-                <el-input v-model="dataForm.name" :placeholder="$i18nForm([$t('module.basicData.Warehouse.OrderName')])" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.IssueOrderTime')" prop="createTime">
-                <el-input v-model="dataForm.createTime" :placeholder="$i18nForm([$t('module.basicData.Warehouse.IssueOrderTime')])" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.PlanProcessQuantity')" prop="planQuantity">
-                <el-input v-model="dataForm.planQuantity" :placeholder="$i18nForm([$t('module.basicData.Warehouse.PlanProcessQuantity')])" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="8">
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.OrderCode')" prop="taskCode">
-                <el-input v-model="dataForm.taskCode" :placeholder="$i18nForm([$t('module.basicData.Warehouse.OrderCode')])" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.OrderStatus')" prop="taskType">
-                <el-input v-model="dataForm.taskType" :placeholder="$i18nForm([$t('module.basicData.Warehouse.OrderStatus')])" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="8">
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.TotalProcessName')" prop="craftName">
-                <el-input v-model="dataForm.craftName" :placeholder="$i18nForm([$t('module.basicData.Warehouse.TotalProcessName')])" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.SubProcessName')" prop="subProccessName">
-                <el-input
-                  v-model="dataForm.subProccessName"
-                  :placeholder="$i18nForm([$t('module.basicData.Warehouse.SubProcessName')])"
-                  readonly
-                  :style="{width: '100%'}"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-col>
-      </el-form>
-    </el-row>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-import { ProcessInfoDetail } from '@/api/orderManage/00A'
-
-export default {
-  data() {
-    return {
-      visible: false,
-      dataForm: {
-        id: 0,
-        name: undefined,
-        createTime: undefined,
-        taskCode: undefined,
-        taskType: undefined,
-        craftName: undefined,
-        planQuantity: undefined,
-        subProccessName: undefined
-      }
-    }
-  },
-  methods: {
-    init(id) {
-      this.dataForm.id = id || ''
-      this.visible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-        if (this.dataForm.id) {
-          ProcessInfoDetail(this.dataForm.id).then(res => {
-            this.dataForm = res.data
-          })
-        }
-      })
-    }
-  }
-}
-</script>

src/views/orderManage/components/processLinkBtn.vue

@@ -1,64 +0,0 @@
-<!--
- * @Date: 2021-01-07 20:09:37
- * @LastEditors: zwq
- * @LastEditTime: 2022-01-17 15:16:29
- * @FilePath: \basic-admin\src\components\BaseTable\subcomponents\CheckDetail.vue
- * @Description:
--->
-<template>
-  <span>
-    <el-popover
-      v-model="visible"
-      placement="top"
-      width="160"
-    >
-      <div>
-        <el-select v-model="value" placeholder="请选择">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </div>
-      <div style="text-align: right; margin: 0">
-        <el-button size="mini" type="text" @click="visible = false">取消</el-button>
-        <el-button type="primary" size="mini" @click="emitClick">确定</el-button>
-      </div>
-      <el-button slot="reference" type="text">{{ $t('module.basicData.Warehouse.RelateProcess') }}</el-button>
-    </el-popover>
-  </span>
-</template>
-
-<script>
-export default {
-  props: {
-    injectData: {
-      type: Object,
-      default: () => ({})
-    }
-  },
-  data() {
-    return {
-      visible: false,
-      options: [{
-        value: '选项1',
-        label: '黄金糕'
-      }, {
-        value: '选项2',
-        label: '双皮奶'
-      }
-      ],
-      value: ''
-    }
-  },
-  methods: {
-    emitClick() {
-      console.log(this.injectData)
-      console.log(this.value)
-      this.visible = false
-    }
-  }
-}
-</script>