数据字典接口

src/api/repairRecord.js

+import request from '@/utils/request'
+
+// 查询维修列表
+export function listRepairRecord(query) {
+  return request({
+    url: '/nltmaintain/queryNltMaintainByPagination',
+    method: 'get',
+    params: query
+  })
+}

src/views/ProductionProcess/workOrder.vue

@@ -631,11 +631,11 @@ export default {
      */
     getStatus(status) {
       switch (status) {
-        case '0':
+        case 0:
           return '待开工'
-        case '1':
+        case 1:
           return '已开工'
-        case '2':
+        case 2:
           return '已结束'
       }
     },

src/views/productionInfo/ModelDetails.vue

@@ -374,7 +374,7 @@
 <script>
 import { listMaterial } from '@/api/material'
 import { listStation } from '@/api/station'
-import { listData } from '@/api/system/dict/data'
+import { getDicts } from '@/api/system/dict/data'
 import { nltmodelAdd, nltmodelDetail, nltmodelUpdate, nltordermodelDetail, nltordermodelUpdate } from '@/api/productionInfo'
 export default {
   name: 'ModelDetails',
@@ -547,12 +547,9 @@ export default {
     },
     listData() {
       return new Promise((resolve, reject) => {
-        const params = {
-          dictType: 'modelType',
-          flag: '1'
-        }
-        listData(params).then(res => {
-          this.modelOption = res.rows
+        const params = 'modelType'
+        getDicts(params).then(res => {
+          this.modelOption = res.data
           resolve()
         }).catch(_ => {
           reject()

src/views/productionInfo/Station.vue

@@ -230,7 +230,7 @@
 </template>
 
 <script>
-import { listData } from '@/api/system/dict/data'
+import { getDicts } from '@/api/system/dict/data'
 import { changeStaStatus, addStation, delStation, getStation, listStation, updateStation } from '@/api/station'
 
 export default {
@@ -407,12 +407,9 @@ export default {
     },
     /** 获取数据字典方法 **/
     getDictFun() {
-      const params = {
-        dictType: 'stationType',
-        flag: '1'
-      }
-      listData(params).then(response => {
-        this.staTypeOptions = response.rows
+      const params = 'stationType'
+      getDicts(params).then(response => {
+        this.staTypeOptions = response.data
       })
     },
     /** 重置对话框表单方法 **/

src/views/productionInfo/badDefinition.vue

@@ -209,28 +209,21 @@
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item class="labelHeight" label="不良描述" prop="rejectDescription">
+              <el-form-item class="labelHeight" label="不良描述" prop="specificExplanation">
                 <div slot="label" class="labelClassRequired">
                   <div class="labelName">不良描述</div>
                 </div>
-                <el-input v-model.trim="form.rejectDescription" show-word-limit :maxlength="128" placeholder="请输入不良描述" />
+                <el-input v-model.trim="form.specificExplanation" show-word-limit :maxlength="128" placeholder="请输入中文描述" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item class="labelHeight" prop="specificExplanation">
+              <el-form-item class="labelHeight" prop="rejectDescription">
                 <div slot="label" class="labelClassRequired">
                   <div class="labelName">Reject Description</div>
                 </div>
-                <el-input v-model.trim="form.specificExplanation" show-word-limit :maxlength="128" placeholder="请输入Reject Description" />
-                <!--                <el-col v-for="(item, index) in form.specificExplanations" :key="item" :span="18" style="width: 70%">-->
-                <!--                  <el-input v-model="item.specificExplanation" :maxlength="200" placeholder="" style="width: 80%;margin-bottom: 10px" />-->
-                <!--                  <el-button v-if="form.specificExplanations.length > 1" style="margin-left: 5%" icon="el-icon-minus" @click.prevent="removeDomain(item,index)" />-->
-                <!--                </el-col>-->
-                <!--                <el-col :span="6">-->
-                <!--                  <el-button type="primary" icon="el-icon-plus" @click="addDomain" />-->
-                <!--                </el-col>-->
+                <el-input v-model.trim="form.rejectDescription" show-word-limit :maxlength="128" placeholder="请输入英文描述" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -267,7 +260,7 @@
           <div slot="tip" class="el-upload__tip" style="color:red">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
         </el-upload>
         <div slot="footer" class="dialog-footer">
-          <el-button class="resetBtn" @click="upload.uploadData = false">取 消 Cancel</el-button>
+          <el-button class="resetBtn" @click="cancelUpload">取 消 Cancel</el-button>
           <el-button :loading="importLoading" class="redBtn" type="danger" @click="uploadBad">确 定 Confirm</el-button>
         </div>
       </el-dialog>
@@ -290,10 +283,9 @@ import {
   exportDisAvdTemplate,
   importDisAvd,
   listBad,
-  updateData,
-  updateStatus
+  updateData
 } from '@/api/badDefinition'
-import { listData } from '@/api/system/dict/data'
+import { getDicts } from '@/api/system/dict/data'
 
 export default {
   name: 'BadDefinition',
@@ -302,6 +294,7 @@ export default {
       importLoading: false,
       // 遮罩层
       loading: false,
+      loadingUpdate: false,
       // 用户表格数据
       badList: null,
       // 总条数
@@ -429,12 +422,9 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      const params = {
-        dictType: 'defectType',
-        flag: '1'
-      }
-      listData(params).then(response => {
-        this.positionOption = response.rows
+      const params = 'defectType'
+      getDicts(params).then(response => {
+        this.positionOption = response.data
         if (this.positionOption[0] !== null) {
           this.form.rejectType = this.positionOption[0].dictValue
           this.form.rejectTypes = this.positionOption[0].dictValue
@@ -456,6 +446,9 @@ export default {
       }).then(function() {
         return deleteLogical(badId)
       }).then(() => {
+        const totalPage = Math.ceil((this.total - 1) / this.queryParams.rows)
+        const currentPage = this.queryParams.page > totalPage ? totalPage : this.queryParams.page
+        this.queryParams.page = currentPage < 1 ? 1 : currentPage
         this.getList()
         this.$message({
           message: '刪除成功',
@@ -465,14 +458,14 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      this.loadingUpdate = true
       this.getDictFun()
       this.reset()
       this.openBad = true
       this.form = JSON.parse(JSON.stringify(row))
       this.form.rejectTypes = this.form.rejectType
+      this.loadingUpdate = false
       this.title = '修改'
-      console.log(this.form)
-      // this.getChildrenDept(userId)
     },
     /** 取消 Cancel按钮操作 */
     cancel() {
@@ -539,12 +532,9 @@ export default {
     },
     /** 获取数据字典方法 **/
     getDictFun() {
-      const params = {
-        dictType: 'defectType',
-        flag: '1'
-      }
-      listData(params).then(response => {
-        this.positionOption = response.rows
+      const params = 'defectType'
+      getDicts(params).then(response => {
+        this.positionOption = response.data
       })
     },
     /** 新增弹窗增加一行按钮*/
@@ -620,6 +610,7 @@ export default {
           if (res.code === 200) {
             this.$message.success(res.message)
             this.upload.uploadData = false
+            this.fileList = []
             this.getList()
             this.$refs.file.clearFiles()
           } else {
@@ -636,6 +627,10 @@ export default {
         })
       }
     },
+    cancelUpload() {
+      this.upload.uploadData = false
+      this.fileList = []
+    },
     cancelMessage() {
       this.openError = false
       this.messageForm.message = undefined

src/views/system/device/index.vue

@@ -263,7 +263,7 @@ import {
   updateDevice
 } from '@/api/system/device'
 import { listPost } from '@/api/badDefinition'
-import { listData } from '@/api/system/dict/data'
+import { getDicts } from '@/api/system/dict/data'
 
 export default {
   name: 'Index',
@@ -388,12 +388,9 @@ export default {
     },
     /** 获取数据字典方法 **/
     getDictFun() {
-      const params = {
-        dictType: 'deviceType',
-        flag: '1'
-      }
-      listData(params).then(response => {
-        this.typeOptions = response.rows
+      const params = 'deviceType'
+      getDicts(params).then(response => {
+        this.typeOptions = response.data
       })
     },
     /** 对话框取消按钮 **/