'工序库位+报表'

2022-03-06 19:36:26 +08:00
--- a/src/views/report-manage/components/HeadForm.vue
+++ b/src/views/report-manage/components/HeadForm.vue
@@ -0,0 +1,67 @@
+<!--
+ * @Descripttion:
+ * @version:
+ * @Author: fzq
+ * @Date: 2022-03-06 17:06:51
+ * @LastEditors: fzq
+ * @LastEditTime: 2022-03-06 17:10:16
+-->
+<template>
+  <el-form :inline="true" @keyup.enter.native="getDataList()">
+    <el-form-item :label="keyName">
+      <el-input v-model="key" style="width:300px" :placeholder="placeholderName" clearable />
+    </el-form-item>
+    <el-form-item>
+      <el-button type="primary" @click="getDataList()">{{ 'btn.search' | i18nFilter }}</el-button>
+      <el-button v-if="showAdd" type="primary" @click="add()">{{ 'btn.add' | i18nFilter }}</el-button>
+      <el-button type="success" @click="downl()">{{ '导出' | i18nFilter }}</el-button>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+import { string } from 'jszip/lib/support'
+
+export default {
+  props: {
+    keyName: {
+      type: string,
+      default: () => {
+        return '关键字'
+      }
+    },
+    showAdd: {
+      type: Boolean,
+      default: () => {
+        return true
+      }
+    },
+    placeholderName: {
+      type: string,
+      default: () => {
+        return '请输入关键字'
+      }
+    }
+  },
+  data() {
+    return {
+      key: ''
+    }
+  },
+  methods: {
+    getDataList() {
+      this.$emit('getDataList', this.key)
+    },
+    add() {
+      this.$emit('add')
+    },
+    downl() {
+      this.$emit('downl', this.key)
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>
--- a/src/views/report-manage/components/edit-substrate.vue
+++ b/src/views/report-manage/components/edit-substrate.vue
@@ -4,7 +4,7 @@
 * @Author: fzq
 * @Date: 2022-03-05 17:45:46
 * @LastEditors: fzq
- * @LastEditTime: 2022-03-05 18:33:24
+ * @LastEditTime: 2022-03-06 16:46:54
 -->
 <template>
  <!-- <el-dialog
@@ -20,7 +20,7 @@
        <el-input v-model="dataForm.substrateCode" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.substrateCode')])" clearable />
      </el-form-item>
      <el-form-item :label="$t('module.report.substrate.location')" prop="location">
-        <el-input v-model="dataForm.location" :placeholder="$i18nForm(['placeholder.input', $t('mmodule.report.substrate.location')])" clearable />
+        <el-input v-model="dataForm.location" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.location')])" clearable />
      </el-form-item>
      <el-form-item :label="$t('module.report.substrate.storeTime')" prop="storeTime">
        <el-input v-model="dataForm.storeTime" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.storeTime')])" clearable />
@@ -28,6 +28,9 @@
      <el-form-item :label="$t('module.report.substrate.substrateStatus')" prop="substrateStatus">
        <el-input v-model="dataForm.substrateStatus" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.substrateStatus')])" clearable />
      </el-form-item>
+      <el-form-item :label="$t('module.report.substrate.interCode')" prop="interCode">
+        <el-input v-model="dataForm.interCode" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.interCode')])" clearable />
+      </el-form-item>
    </el-form>
    <span slot="footer" class="dialog-footer">
      <el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
@@ -56,27 +59,68 @@ export default {
        substrateCode: '',
        location: '',
        storeTime: '',
+        substrateStatus: '',
+        code: '',
+        storageBoxId: '',
+        storageCode: '',
+        interCode: ''
+      },
+      list: {
+        id: '',
+        location: '',
+        storeTime: '',
+        substrateCode: '',
        substrateStatus: ''
+      },
+      dataRule: {
+        substrateCode: [
+          { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.report.substrate.substrateCode')]), trigger: 'blur' }
+        ],
+        code: [
+          { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.report.substrate.substrateCode')]), trigger: 'blur' }
+        ],
+        interCode: [
+          { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.report.substrate.substrateCode')]), trigger: 'blur' }
+        ]
      }
-    //   dataRule: {
-    //     name: [
-    //       { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.cache.LocationName')]), trigger: 'blur' }
-    //     ],
-    //     code: [
-    //       { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.cache.LocationCode')]), trigger: 'blur' }
-    //     ]
-    //   }
    }
  },
+  created() {
+    this.init()
+  },
  methods: {
+    // init(id) {
+    //   // this.dataForm.id = id || ''
+    //   this.dataForm.storageBoxId = this.$route.query.id
+    //   this.dataForm.storageCode = this.$route.query.code
+    //   this.visible = true
+    //   this.$nextTick(() => {
+    //     this.$refs['dataForm'].resetFields()
+    //     // console.log(this.dataForm)
+    //     listSubstrate(this.dataForm).then(res => {
+    //       this.dataForm.id = res.data.id
+    //       this.dataForm.location = res.data.location
+    //       this.dataForm.storeTime = res.data.storeTime
+    //       this.dataForm.substrateCode = res.data.substrateCode
+    //       this.dataForm.substrateStatus = res.data.substrateStatus
+    //       // console.log(this.dataForm)
+    //     })
+    //   })
+    // },
    init(id) {
-      this.dataForm.id = id || ''
+      // this.dataForm.id = id || ''
+      this.dataForm.storageBoxId = this.$route.query.id
+      this.dataForm.storageCode = this.$route.query.code
      this.visible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-        listSubstrate(this.dataForm.id).then(res => {
-          this.dataForm = res.data
-        })
+      listSubstrate(this.dataForm).then(res => {
+        console.log(res.data[0])
+        this.dataForm.id = res.data[0].id
+        this.dataForm.location = res.data[0].location
+        this.dataForm.storeTime = res.data[0].storeTime
+        this.dataForm.substrateCode = res.data[0].substrateCode
+        this.dataForm.substrateStatus = res.data[0].substrateStatus
+        this.dataForm.interCode = res.data[0].interCode
+        // console.log(this.dataForm)
      })
    },
    // 表单提交
@@ -88,8 +132,11 @@ export default {
            'storeTime': this.dataForm.storeTime,
            'id': this.dataForm.id,
            'substrateCode': this.dataForm.substrateCode,
-            'location': this.dataForm.location
+            'location': this.dataForm.location,
+            'interCode': this.dataForm.interCode,
+            'storageBoxId': this.dataForm.storageBoxId
          }
+          console.log(data)
          updateSubstrate(data).then(res => {
            this.$message({
              message: this.$t('module.basicData.visual.success'),
--- a/src/views/report-manage/components/viewSubstrate.vue
+++ b/src/views/report-manage/components/viewSubstrate.vue
@@ -4,7 +4,7 @@
 * @Author: fzq
 * @Date: 2022-03-05 15:55:45
 * @LastEditors: fzq
- * @LastEditTime: 2022-03-05 19:42:10
+ * @LastEditTime: 2022-03-05 19:44:47
 -->
 <template>
  <div class="app-container">
@@ -162,9 +162,9 @@ export default {
    // 新增 / 修改
    addNew(id) {
      this.addOrUpdateVisible = true
-    //   this.$nextTick(() => {
-    //     this.$refs.addOrUpdate.init(id)
-    //   })
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(id)
+      })
    },
    goback() {
      this.$router.go(-1)