'基础+报表'

2022-03-05 19:43:42 +08:00
parent b5081ba279
commit 82f44b5a62
20 changed files with 1198 additions and 166 deletions
--- a/src/views/basicData/Equipment/components/equipmentInfo-add.vue
+++ b/src/views/basicData/Equipment/components/equipmentInfo-add.vue
@@ -37,7 +37,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="8">
-            <el-form-item :label="$t('module.basicData.equipment.EquipmentType')" prop="equipmentType">
+            <!-- <el-form-item :label="$t('module.basicData.equipment.EquipmentType')" prop="equipmentType">
              <el-select
                v-model="dataForm.equipmentType"
                :disabled="isdetail"
@@ -53,9 +53,25 @@
                  :disabled="item.disabled"
                />
              </el-select>
+            </el-form-item> -->
+            <el-form-item :label="$t('module.basicData.equipment.EquipmentType')" prop="equipmentType">
+              <el-input v-model="dataForm.equipmentType" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.equipment.EquipmentType')])" clearable :style="{width: '100%'}" />
            </el-form-item>
          </el-col>
          <el-col :span="8">
+            <el-form-item :label="$t('module.basicData.visual.enterTime')" prop="enterTime">
+              <el-date-picker
+                v-model="dataForm.enterTime"
+                :disabled="isdetail"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-ddT00:00:00"
+                :style="{width: '100%'}"
+                :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.enterTime')])"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="8">
            <el-form-item :label="$t('module.basicData.equipment.EquipmentGrouping')" prop="groupId">
              <el-select
                v-model="dataForm.groupId"
@@ -73,10 +89,10 @@
                />
              </el-select>
            </el-form-item>
-          </el-col>
+          </el-col> -->
        </el-row>
        <el-row>
-          <el-col :span="8">
+          <!-- <el-col :span="8">
            <el-form-item :label="$t('module.basicData.visual.Specs')" prop="spec">
              <el-input v-model="dataForm.spec" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Specs')])" clearable :style="{width: '100%'}" />
            </el-form-item>
@@ -93,23 +109,10 @@
                clearable
              />
            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item :label="$t('module.basicData.visual.enterTime')" prop="enterTime">
-              <el-date-picker
-                v-model="dataForm.enterTime"
-                :disabled="isdetail"
-                format="yyyy-MM-dd"
-                value-format="yyyy-MM-dd"
-                :style="{width: '100%'}"
-                :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.enterTime')])"
-                clearable
-              />
-            </el-form-item>
-          </el-col>
+          </el-col> -->
        </el-row>
        <el-row>
-          <el-col :span="8">
+          <!-- <el-col :span="8">
            <el-form-item :label="$t('module.basicData.visual.debugTime')" prop="debugTime">
              <el-date-picker
                v-model="dataForm.debugTime"
@@ -126,7 +129,7 @@
            <el-form-item :label="$t('module.basicData.equipment.DebugPeriod')" prop="debugPeriod">
              <el-input v-model="dataForm.debugPeriod" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.equipment.DebugPeriod')])" clearable :style="{width: '100%'}" />
            </el-form-item>
-          </el-col>
+          </el-col> -->
          <el-col :span="8">
            <el-form-item :label="$t('module.basicData.visual.Manufacturer')" prop="manufacturer">
              <el-input
@@ -138,9 +141,19 @@
              />
            </el-form-item>
          </el-col>
+          <el-col :span="8">
+            <el-form-item :label="$t('module.basicData.visual.Remarks')" prop="remark">
+              <el-input v-model="dataForm.remark" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Remarks')])" clearable :style="{width: '100%'}" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :label="$t('module.basicData.visual.Description')" prop="description">
+              <el-input v-model="dataForm.description" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Description')])" clearable :style="{width: '100%'}" />
+            </el-form-item>
+          </el-col>
        </el-row>
        <el-row>
-          <el-col :span="8">
+          <!-- <el-col :span="8">
            <el-form-item :label="$t('module.basicData.equipment.intellectualProperty')" prop="intellectualProperty">
              <el-input
                v-model="dataForm.intellectualProperty"
@@ -162,20 +175,8 @@
                :style="{width: '100%'}"
              />
            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item :label="$t('module.basicData.visual.Remarks')" prop="remark">
-              <el-input v-model="dataForm.remark" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Remarks')])" clearable :style="{width: '100%'}" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item :label="$t('module.basicData.visual.Description')" prop="description">
-              <el-input v-model="dataForm.description" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Description')])" clearable :style="{width: '100%'}" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
+          </el-col> -->
+          <!-- <el-col :span="8">
            <el-form-item :label="$t('module.basicData.equipment.plcVersion')" prop="plcVersion">
              <el-input v-model="dataForm.plcVersion" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.equipment.plcVersion')])" clearable :style="{width: '100%'}" />
            </el-form-item>
@@ -184,9 +185,9 @@
            <el-form-item :label="$t('module.basicData.equipment.eapVersion')" prop="eapVersion">
              <el-input v-model="dataForm.eapVersion" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.equipment.eapVersion')])" clearable :style="{width: '100%'}" />
            </el-form-item>
-          </el-col>
+          </el-col> -->
        </el-row>
-        <el-row>
+        <!-- <el-row>
          <el-col :span="8">
            <el-form-item :label="$t('module.basicData.equipment.maintenanceCycle')" prop="maintenanceCycle">
              <el-input v-model="dataForm.maintenanceCycle" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.equipment.maintenanceCycle')])" clearable :style="{width: '100%'}" />
@@ -197,9 +198,9 @@
              <el-input v-model="dataForm.maintenanceTime" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.equipment.maintenanceTime')])" clearable :style="{width: '100%'}" />
            </el-form-item>
          </el-col>
-        </el-row>
+        </el-row> -->
        <el-row>
-          <el-col :span="4">
+          <!-- <el-col :span="4">
            <el-form-item :label="$t('module.basicData.equipment.E10Status')" prop="estatus">
              <el-switch
                v-model="dataForm.estatus"
@@ -248,11 +249,11 @@
                inactive-color="#AAAAAA"
              />
            </el-form-item>
-          </el-col>
+          </el-col> -->
        </el-row>
        <el-row>
          <el-col :span="9">
-            <el-form-item v-if="listQuery.equipmentId && !isdetail" :label="$t('module.basicData.equipment.equipmentImg')" prop="eImg">
+            <!-- <el-form-item v-if="listQuery.equipmentId && !isdetail" :label="$t('module.basicData.equipment.equipmentImg')" prop="eImg">
              <el-upload
                ref="eImg"
                name="files"
@@ -265,7 +266,7 @@
              >
                <el-button size="small" type="primary" icon="el-icon-upload">{{ 'btn.upload' | i18nFilter }}</el-button>
              </el-upload>
-            </el-form-item>
+            </el-form-item> -->
            <el-form-item v-if="isdetail" :label="$t('module.basicData.equipment.equipmentImg')" prop="upInfo">
              <div v-for="item in imgList" :key="item.id">
                {{ item.fileName }} <el-button size="small" type="primary" icon="el-icon-upload" @click="downloadFile(item.fileId)">{{ 'btn.download' | i18nFilter }}</el-button>
@@ -332,9 +333,7 @@ import {
  equipmentInfoCode,
  equipmentInfoFileAdd
 } from '@/api/basicData/Equipment/equipmentInfo'
-import { equipmentGroupList } from '@/api/basicData/Equipment/equipmentGroup'
 import { equipmentInfoAttrList, equipmentInfoAttrDelete } from '@/api/basicData/Equipment/equipmentInfoAttr'
-import { equipmentTypeList } from '@/api/basicData/Equipment/equipmentType'
 import BaseTable from '@/components/BaseTable'
 import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
 import equipmentInfoAttrAdd from './equipmentInfoAttr-add'
@@ -364,15 +363,15 @@ const tableProps = [
    align: 'center'
  },
  {
-    prop: 'attrValue',
+    prop: 'attrContent',
    label: i18n.t('module.basicData.visual.AttributeValue'),
    align: 'center'
-  },
-  {
-    prop: 'remark',
-    label: i18n.t('module.basicData.visual.Remarks'),
-    align: 'center'
  }
+  // {
+  //   prop: 'remark',
+  //   label: i18n.t('module.basicData.visual.Remarks'),
+  //   align: 'center'
+  // }
 ]

 export default {
@@ -428,17 +427,17 @@ export default {
          required: true,
          message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.equipment.EquipmentType')]),
          trigger: 'change'
-        }],
-        maintenanceCycle: [{
-          required: true,
-          message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.equipment.maintenanceCycle')]),
-          trigger: 'blur'
-        }],
-        maintenanceTime: [{
-          required: true,
-          message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.equipment.maintenanceTime')]),
-          trigger: 'blur'
        }]
+        // maintenanceCycle: [{
+        //   required: true,
+        //   message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.equipment.maintenanceCycle')]),
+        //   trigger: 'blur'
+        // }],
+        // maintenanceTime: [{
+        //   required: true,
+        //   message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.equipment.maintenanceTime')]),
+        //   trigger: 'blur'
+        // }]
      },
      typeCode: {},
      eImgAction: uploadPath,
@@ -461,6 +460,7 @@ export default {
  created() {
    this.listQuery.equipmentId = this.$route.query.id
    this.init()
+    this.getList()
  },
  methods: {
    init() {
@@ -484,12 +484,12 @@ export default {
      //   })
      // }
      // this.list.splice(0, this.list.length)
-      equipmentTypeList(this.listQuery).then(response => {
-        this.equipmentTypeOption = response.data.records
-      })
-      equipmentGroupList(this.listQuery).then(response => {
-        this.equipmentGroupOption = response.data.records
-      })
+      // equipmentTypeList(this.listQuery).then(response => {
+      //   this.equipmentTypeOption = response.data.records
+      // })
+      // equipmentGroupList(this.listQuery).then(response => {
+      //   this.equipmentGroupOption = response.data.records
+      // })
      this.$nextTick(() => {
        this.$refs['dataForm'].resetFields()
        if (this.listQuery.equipmentId) {
@@ -514,7 +514,9 @@ export default {
    },
    getList() {
      this.listLoading = true
+      console.log(this.listQuery)
      equipmentInfoAttrList(this.listQuery).then(response => {
+        console.log(response)
        if (response.data.records) {
          this.list = response.data.records
        } else {
--- a/src/views/basicData/Equipment/components/equipmentInfoAttr-add.vue
+++ b/src/views/basicData/Equipment/components/equipmentInfoAttr-add.vue
@@ -1,8 +1,8 @@
 <!--
 * @Author: zwq
 * @Date: 2020-12-29 16:37:56
- * @LastEditors: zwq
- * @LastEditTime: 2021-03-25 16:31:46
+ * @LastEditors: fzq
+ * @LastEditTime: 2022-03-05 14:08:41
 * @Description:
 -->
 <template>
@@ -19,12 +19,12 @@
      <el-form-item :label="$t('module.basicData.visual.AttributeName')" prop="attrName">
        <el-input v-model="dataForm.attrName" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.AttributeName')])" clearable />
      </el-form-item>
-      <el-form-item :label="$t('module.basicData.visual.AttributeValue')" prop="attrValue">
-        <el-input v-model="dataForm.attrValue" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.AttributeValue')])" clearable />
+      <el-form-item :label="$t('module.basicData.visual.AttributeValue')" prop="attrContent">
+        <el-input v-model="dataForm.attrContent" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.AttributeValue')])" clearable />
      </el-form-item>
-      <el-form-item :label="$t('module.basicData.visual.Remarks')" prop="remark">
+      <!-- <el-form-item :label="$t('module.basicData.visual.Remarks')" prop="remark">
        <el-input v-model="dataForm.remark" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Remarks')])" clearable />
-      </el-form-item>
+      </el-form-item> -->
    </el-form>
    <div class="drawer-footer">
      <el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
@@ -52,14 +52,14 @@ export default {
      dataForm: {
        id: 0,
        attrName: '',
-        attrValue: '',
+        attrContent: '',
        remark: ''
      },
      dataRule: {
        attrName: [
          { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.visual.AttributeName')]), trigger: 'blur' }
        ],
-        attrValue: [
+        attrContent: [
          { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.visual.AttributeValue')]), trigger: 'blur' }
        ]
      }
@@ -74,6 +74,7 @@ export default {
        this.$refs['dataForm'].resetFields()
        if (this.dataForm.id) {
          equipmentInfoAttrDetail(this.dataForm.id).then(res => {
+            console.log(res)
            this.dataForm = res.data
          })
        }
@@ -86,7 +87,7 @@ export default {
        if (valid) {
          const data = {
            'attrName': this.dataForm.attrName,
-            'attrValue': this.dataForm.attrValue,
+            'attrContent': this.dataForm.attrContent,
            'remark': this.dataForm.remark,
            'equipmentId': this.equipmentId,
            'id': this.dataForm.id
--- a/src/views/basicData/Equipment/equipmentInfo.vue
+++ b/src/views/basicData/Equipment/equipmentInfo.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 15:41:11
 * @LastEditors: fzq
- * @LastEditTime: 2022-03-03 20:28:43
+ * @LastEditTime: 2022-03-05 11:01:57
 * @Description:
 -->
 <template>