'工序库位+报表'

2022-03-06 19:36:26 +08:00
parent 82f44b5a62
commit 97997681a2
14 changed files with 376 additions and 193 deletions
--- a/src/views/basicData/Process/components/processInfo-add.vue
+++ b/src/views/basicData/Process/components/processInfo-add.vue
@@ -1,30 +1,34 @@
+<!--
+ * @Descripttion:
+ * @version:
+ * @Author: fzq
+ * @Date: 2022-03-04 11:12:42
+ * @LastEditors: fzq
+ * @LastEditTime: 2022-03-06 19:17:36
+-->
 <template>
  <el-dialog
-    :title="!dataForm.id ? 'btn.add' : 'btn.edit' | i18nFilter"
+    :title="!dataForm.locationId ? 'btn.add' : 'btn.edit' | i18nFilter"
    :visible.sync="visible"
  >
-    <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="130px" @keyup.enter.native="dataFormSubmit()">
-      <el-form-item :label="$t('module.basicData.storageBox.name')" prop="storageBoxName">
-        <el-input v-model="dataForm.storageBoxName" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.storageBox.name')])" clearable />
+    <el-form ref="dataForm" :model="dataForm" label-width="130px" @keyup.enter.native="dataFormSubmit()">
+      <el-form-item :label="$t('module.basicData.processLocation.sequence')" prop="sequence">
+        <el-input v-model="dataForm.sequence" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.sequence')])" clearable />
      </el-form-item>
-      <el-form-item :label="$t('module.basicData.storageBox.code')" prop="code">
-        <el-input v-model="dataForm.code" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.storageBox.code')])" clearable />
+      <el-form-item :label="$t('module.basicData.processLocation.workSequenId')" prop="workSequenId">
+        <el-input v-model="dataForm.workSequenId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.workSequenId')])" clearable />
      </el-form-item>
-      <el-form-item :label="$t('module.basicData.visual.EnglishName')" prop="enName">
-        <el-input v-model="dataForm.enName" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.EnglishName')])" clearable />
+      <el-form-item :label="$t('module.basicData.processLocation.locationName')" prop="locationName">
+        <el-input v-model="dataForm.locationName" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.locationName')])" clearable />
      </el-form-item>
-      <el-form-item :label="$t('module.basicData.storageBox.status')" prop="status">
-        <el-select v-model="dataForm.status" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.storageBox.status')])" clearable>
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
+      <el-form-item :label="$t('module.basicData.processLocation.locationId')" prop="locationId">
+        <el-input v-model="dataForm.locationId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.locationId')])" clearable />
      </el-form-item>
-      <el-form-item :label="$t('module.basicData.visual.Remarks')" prop="note">
-        <el-input v-model="dataForm.note" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Remarks')])" clearable />
+      <el-form-item :label="$t('module.basicData.processLocation.isProcess')" prop="isProcess">
+        <el-input v-model="dataForm.isProcess" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.isProcess')])" clearable />
+      </el-form-item>
+      <el-form-item :label="$t('module.basicData.processLocation.equipmentMark')" prop="equipmentMark">
+        <el-input v-model="dataForm.equipmentMark" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.equipmentMark')])" clearable />
      </el-form-item>
    </el-form>
    <span slot="footer" class="dialog-footer">
@@ -35,7 +39,7 @@
 </template>

 <script>
-import { storageBoxDetail, storageBoxUpdate, storageBoxAdd, storageBoxCode } from '@/api/basicData/Cache/storageBox'
+import { detail, update, add } from '@/api/basicData/Cache/processLocation'

 export default {
  data() {
@@ -43,56 +47,37 @@ export default {
      visible: false,
      dataForm: {
        id: 0,
-        storageBoxName: '',
-        code: '',
-        status: 0,
-        enName: '',
-        note: ''
+        sequence: '',
+        locationName: '',
+        isProcess: '',
+        equipmentMark: ''
      },
-      options: [
-        {
-          value: 0,
-          label: '正常'
-        },
-        {
-          value: 1,
-          label: '维修中'
-        },
-        {
-          value: 2,
-          label: '报废'
-        }
-      ],
-      dataRule: {
-        storageBoxName: [
-          {
-            required: true,
-            message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.storageBox.name')]),
-            trigger: 'blur' }
-        ],
-        code: [
-          {
-            required: true,
-            message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.storageBox.code')]),
-            trigger: 'blur' }
-        ]
+      listQuery: {
+        current: 1,
+        size: 10,
+        locationId: '',
+        workSequenId: '',
+        locationName: ''
      }
    }
  },
  methods: {
-    init(id) {
-      this.dataForm.id = id || ''
+    init(LocationId) {
+      this.listQuery.LocationId = LocationId || ''
      this.visible = true
      this.$nextTick(() => {
        this.$refs['dataForm'].resetFields()
-        if (this.dataForm.id) {
-          storageBoxDetail(this.dataForm.id).then(res => {
+        if (this.listQuery.LocationId) {
+          // list(this.listQuery).then(res =>{
+          //   this.list = response.data.records
+          // })
+          detail(this.dataForm.id).then(res => {
            this.dataForm = res.data
          })
        } else {
-          storageBoxCode().then(res => {
-            this.dataForm.code = res.data
-          })
+          // storageBoxCode().then(res => {
+          //   this.dataForm.code = res.data
+          // })
        }
      })
    },
@@ -103,7 +88,7 @@ export default {
          const data = this.dataForm
          data.id = this.dataForm.id
          if (this.dataForm.id) {
-            storageBoxUpdate(data).then(res => {
+            update(data).then(res => {
              this.$message({
                message: this.$t('module.basicData.visual.success'),
                type: 'success',
@@ -115,7 +100,7 @@ export default {
              })
            })
          } else {
-            storageBoxAdd(data).then(res => {
+            add(data).then(res => {
              this.$message({
                message: this.$t('module.basicData.visual.success'),
                type: 'success',
--- a/src/views/basicData/Process/processInfo.vue
+++ b/src/views/basicData/Process/processInfo.vue
@@ -4,7 +4,7 @@
 * @Author: fzq
 * @Date: 2022-03-03 09:51:25
 * @LastEditors: fzq
- * @LastEditTime: 2022-03-03 10:06:26
+ * @LastEditTime: 2022-03-06 19:15:25
 -->
 <template>
  <div class="app-container">
@@ -45,9 +45,8 @@ import BaseTable from '@/components/BaseTable'
 import processInfoAdd from './components/processInfo-add'
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
 import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
-import { storageBoxList, storageBoxDelete } from '@/api/basicData/Cache/storageBox'
+import { list, locaDelete } from '@/api/basicData/Cache/processLocation'
 import { timeFormatter } from '@/filters'
-import basicData from '@/filters/basicData'
 /**
 * 表格表头配置项 TypeScript接口注释
 * tableConfig<ConfigItem> = []
@@ -82,29 +81,33 @@ const tableProps = [
    align: 'center'
  },
  {
-    prop: 'storageBoxName',
-    label: i18n.t('module.basicData.storageBox.name'),
+    prop: 'sequence',
+    label: i18n.t('module.basicData.processLocation.sequence'),
    align: 'center'
  },
  {
-    prop: 'code',
-    label: i18n.t('module.basicData.storageBox.code'),
+    prop: 'locationName',
+    label: i18n.t('module.basicData.processLocation.locationName'),
    align: 'center'
  },
  {
-    prop: 'enName',
-    label: i18n.t('module.basicData.visual.EnglishName'),
+    prop: 'isProcess',
+    label: i18n.t('module.basicData.processLocation.isProcess'),
    align: 'center'
  },
  {
-    prop: 'status',
-    label: i18n.t('module.basicData.storageBox.status'),
-    filter: basicData('storage'),
+    prop: 'locationId',
+    label: i18n.t('module.basicData.processLocation.locationId'),
    align: 'center'
  },
  {
-    prop: 'note',
-    label: i18n.t('module.basicData.storageBox.remark'),
+    prop: 'workSequenId',
+    label: i18n.t('module.basicData.processLocation.workSequenId'),
+    align: 'center'
+  },
+  {
+    prop: 'equipmentMark',
+    label: i18n.t('module.basicData.processLocation.equipmentMark'),
    align: 'center'
  }
 ]
@@ -126,7 +129,7 @@ export default {
    return {
      addOrUpdateVisible: false,
      keyName: i18n.t('module.basicData.visual.keyword'),
-      placeholderName: this.$t('module.basicData.storageBox.name') + this.$t('module.basicData.visual.Or') + this.$t('module.basicData.storageBox.code'),
+      placeholderName: i18n.t('module.basicData.processLocation.locationName'),
      tableBtn,
      trueWidth: 200,
      tableProps,
@@ -136,7 +139,10 @@ export default {
      listLoading: true,
      listQuery: {
        current: 1,
-        size: 10
+        size: 10,
+        locationId: '',
+        workSequenId: '',
+        locationName: ''
      }
    }
  },
@@ -146,12 +152,13 @@ export default {
  methods: {
    handleClick(raw) {
      if (raw.type === 'delete') {
-        this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.storageBoxName}]?`, this.$t('module.basicData.visual.Tips'), {
+        this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.locationName}]?`, this.$t('module.basicData.visual.Tips'), {
          confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
          cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
          type: 'warning'
        }).then(() => {
-          storageBoxDelete(raw.data.id).then(response => {
+          console.log(raw.data)
+          locaDelete(raw.data.id).then(response => {
            this.$message({
              message: this.$t('module.basicData.visual.success'),
              type: 'success',
@@ -163,21 +170,22 @@ export default {
          })
        }).catch(() => {})
      } else if (raw.type === 'edit') {
-        this.addNew(raw.data.id)
+        this.addNew(raw.data.locationId)
      } else {
-        this.addNew(raw.data.id, true)
+        this.addNew(raw.data.locationId, true)
      }
    },
    getList(key) {
      this.listLoading = true
-      this.listQuery.storageBoxName = key
-      storageBoxList(this.listQuery).then(response => {
+      this.listQuery.locationName = key
+      list(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
+        console.log(response)
        this.listLoading = false
      })
    },