调整营养素页面相关功能

src/views/nutrient/index.vue

@@ -36,9 +36,9 @@
           <el-image style="width: 150px; height: 180px" :src="row.coverPic" fit="contain" v-if="row.coverPic" />
         </template>
       </el-table-column>
-      <el-table-column label="ID" align="center" width="60">
+      <el-table-column label="自定义ID" align="center" width="100">
         <template slot-scope="{row}">
-          <span>{{ row.id }}</span>
+          <span>{{ row.id2 }}</span>
         </template>
       </el-table-column>
       <el-table-column label="名称" align="center" width="150">
@@ -56,6 +56,11 @@
           <span>{{ row.code }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="上级营养素名称" align="center" width="150">
+        <template slot-scope="{row}">
+          <span>{{ row.parentName }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="推荐用量类型" align="center" width="70">
         <template slot-scope="{row}">
           <span>{{ row.recommendType | recommendTypeFilter }}</span>
@@ -63,17 +68,17 @@
       </el-table-column>
       <el-table-column label="每日推荐量值" align="center" width="70">
         <template slot-scope="{row}">
-          <span>{{ row.recommend ? `${row.recommend} ${row.recommendUnitName}` : '' }}</span>
+          <span>{{ row.recommend ? `${row.recommend} ${row.recommendUnit}` : '' }}</span>
         </template>
       </el-table-column>
       <el-table-column label="每日推荐量范围起始值" align="center" width="80">
         <template slot-scope="{row}">
-          <span>{{ row.recommendBegin ? `${row.recommendBegin} ${row.recommendUnitName}` : '' }}</span>
+          <span>{{ row.recommendBegin ? `${row.recommendBegin} ${row.recommendUnit}` : '' }}</span>
         </template>
       </el-table-column>
       <el-table-column label="每日推荐量范围截止值" align="center" width="80">
         <template slot-scope="{row}">
-          <span>{{ row.recommendEnd ? `${row.recommendEnd} ${row.recommendUnitName}` : '' }}</span>
+          <span>{{ row.recommendEnd ? `${row.recommendEnd} ${row.recommendUnit}` : '' }}</span>
         </template>
       </el-table-column>
       <el-table-column label="创建时间" width="180px" align="center">
@@ -86,8 +91,8 @@
           <span>{{ row.updateTime }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="350">
-        <template slot-scope="{row,$index}">
+      <el-table-column label="操作" align="center" width="480">
+        <template slot-scope="{row}">
           <el-button type="primary" size="mini" @click="handleCreateOrUpdate('update', row)">
             更新
           </el-button>
@@ -100,28 +105,37 @@
           <el-button type="primary" size="mini" @click="updateSort(row, 2)">
             置顶
           </el-button>
-          <el-button size="mini" type="danger" @click="handleDelete(row, $index)">
+          <el-button type="primary" size="mini" @click="updateSort(row, 3)">
+            置底
+          </el-button>
+          <el-button size="mini" type="danger" @click="handleDelete(row)">
             删除
           </el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total>0" :total="total" :page.sync="listQuery.pageNum" :limit.sync="listQuery.pageSize" @pagination="fetchData" />
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="listQuery.pageNum"
+      :limit.sync="listQuery.pageSize"
+      @pagination="fetchData"
+    />
 
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
       <el-form ref="dataForm" :rules="rules" :model="params" label-position="left" label-width="200px" style="width: 400px; margin-left:50px;">
-        <el-form-item label="ID" prop="id">
-          <el-input v-model="params.id" placeholder="请输入ID" />
+        <el-form-item label="自定义ID" prop="id2">
+          <el-input v-model="params.id2" placeholder="请输入自定义ID" />
         </el-form-item>
         <el-form-item label="名称" prop="name">
-          <el-input v-model="params.name" placeholder="请输入名称" />
+          <el-input v-model="params.name" placeholder="请输入名称" :disabled="dialogStatus === 'edit'" />
         </el-form-item>
         <el-form-item label="英文名称" prop="enName">
           <el-input v-model="params.enName" placeholder="请输入英文名称" />
         </el-form-item>
         <el-form-item label="编码" prop="code">
-          <el-input v-model="params.code" placeholder="编码" />
+          <el-input v-model="params.code" placeholder="编码" :disabled="dialogStatus === 'edit'" />
         </el-form-item>
         <el-form-item label="推荐用量类型" prop="recommendType">
           <el-radio v-model="params.recommendType" :label="0">值</el-radio>
@@ -137,7 +151,7 @@
             placeholder="请选择推荐量单位"
             :remote-method="queryUnits"
             :loading="loading">
-            <el-option v-for="item in units" :key="item.id" :label="item.name" :value="item.id" />
+            <el-option v-for="item in units" :key="item.id" :label="item.name" :value="item.name" />
           </el-select>
         </el-form-item>
         <el-form-item label="每日推荐摄入量" v-if="params.recommendType===0" prop="recommend">
@@ -169,7 +183,7 @@
         <el-button @click="dialogFormVisible = false">
           取消
         </el-button>
-        <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">
+        <el-button type="primary" @click="createOrUpdateData">
           提交
         </el-button>
       </div>
@@ -211,7 +225,6 @@ export default {
         create: '新建'
       },
       rules: {
-        id: [{ required: true, message: 'ID不允许为空', trigger: 'blur' }],
         name: [{ required: true, message: '名称不允许为空', trigger: 'blur' }]
       },
       params: { recommendType: 2 },
@@ -230,9 +243,8 @@ export default {
         this.list = response.data.list
         this.total = response.data.count
         this.listLoading = false
-        this.$nextTick(()=>{
-          this.$refs.table.doLayout()
-        })
+      }).catch(() => {
+        this.$message.error('获取数据失败')
       })
     },
     handleCreateOrUpdate(dialogStatus, row) {
@@ -245,37 +257,24 @@ export default {
         this.$refs['dataForm'].clearValidate()
       })
     },
-    handleDelete(row, index) {
+    handleDelete(row) {
       remove(row.id).then(res => {
-        this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
-        this.list.splice(index, 1)
+        this.$message.success('提交成功')
+        this.fetchData()
       }).catch(res => {
         this.$message.error(res.data.message)
       })
     },
-    createData() {
-      if (this.params) {
-        create(this.params).then(res => {
-          this.$notify({ title: '成功', message: '提交成功', type: 'success', duration: 2000 })
-          this.fetchData()
-          this.dialogFormVisible = false
-        }).catch(error => {
-          this.$notify({ title: '失败', message: error.response.data.message, type: 'error', duration: 2000 })
-          this.fetchData()
-        })
-      }
-    },
-    updateData() {
-      if (this.params) {
-        update(this.params.id, this.params).then(res => {
-          this.$notify({ title: '成功', message: '提交成功', type: 'success', duration: 2000 })
-          this.fetchData()
-          this.dialogFormVisible = false
-        }).catch(res => {
-          this.$notify({ title: '失败', message: res.data.message, type: 'error', duration: 2000 })
-          this.fetchData()
-        })
-      }
+    createOrUpdateData() {
+      let resultPromise = this.dialogStatus === 'create' ? create(this.params) : update(this.params.id, this.params)
+      resultPromise.then(res => {
+        this.$message.success('提交成功')
+        this.fetchData()
+        this.dialogFormVisible = false
+      }).catch(res => {
+        this.$message.error(res.data.message)
+        this.fetchData()
+      })
     },
     queryUnits(query) {
       this.loading = true