Merge remote-tracking branch 'origin/master'

src/api/model.js

+// 生产模型api
+import request from '@/utils/request'
+
+// 分页查询列表
+export function listModel(query) {
+  return request({
+    url: '/nltmodel/queryNltModelByPagination',
+    method: 'get',
+    params: query
+  })
+}

src/views/productionInfo/ProductionModel.vue

@@ -55,13 +55,13 @@
             :data="modelList"
           >
             <el-table-column type="index" label="序号" width="50" />
-            <el-table-column align="center" prop="partNo" width="200" :show-overflow-tooltip="true">
+            <el-table-column align="center" prop="materCode" width="200" :show-overflow-tooltip="true">
               <template slot="header">
                 <div>成品料号</div>
                 <div>Part No.</div>
               </template>
               <template v-slot:default="scope">
-                {{ scope.row.partNo || '-' }}
+                {{ scope.row.materCode || '-' }}
               </template>
             </el-table-column>
             <el-table-column align="center" prop="modelType" :show-overflow-tooltip="true">
@@ -73,22 +73,22 @@
                 {{ scope.row.modelType || '-' }}
               </template>
             </el-table-column>
-            <el-table-column align="center" width="200" prop="createTime" :show-overflow-tooltip="true">
+            <el-table-column align="center" width="200" prop="createDate" :show-overflow-tooltip="true">
               <template slot="header">
                 <div>创建时间</div>
                 <div>Build Time</div>
               </template>
               <template slot-scope="scope">
-                {{ scope.row.createTime || '-' }}
+                {{ scope.row.createDate || '-' }}
               </template>
             </el-table-column>
-            <el-table-column align="center" width="200" prop="operator" :show-overflow-tooltip="true">
+            <el-table-column align="center" width="200" prop="updatePerName" :show-overflow-tooltip="true">
               <template slot="header">
                 <div>操作人</div>
                 <div>Operator</div>
               </template>
               <template slot-scope="scope">
-                {{ scope.row.operator || '-' }}
+                {{ scope.row.updatePerName || '-' }}
               </template>
             </el-table-column>
             <el-table-column align="center" width="100" prop="flag">
@@ -157,6 +157,8 @@
 </template>
 
 <script>
+import { listModel } from '@/api/model'
+
 export default {
   name: 'ProductionModel',
   data() {
@@ -183,7 +185,12 @@ export default {
   methods: {
     /** 列表获取 */
     getList() {
-      console.log('查询成功')
+      this.loading = true
+      listModel(this.queryParams).then(response => {
+        this.modelList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
     },
     /** 查询按钮操作 */
     handleQuery() {

src/views/productionInfo/badDefinition.vue

@@ -2,14 +2,14 @@
   <div class="bad_definition">
     <div class="badSearch" style="border-bottom: 14px solid #f4f4f4">
       <el-form ref="queryForm" style="padding: 0 0 0 10px" class="formClass" :model="queryParams" :inline="true" label-width="auto">
-        <el-form-item label="不良编号" prop="rejectCode">
+        <el-form-item label="不良编码" prop="rejectCode">
           <div slot="label" class="labelClass">
-            <div>不良编号</div>
+            <div>不良编码</div>
             <div>Reject Code</div>
           </div>
           <el-input
             v-model.trim="queryParams.rejectCode"
-            placeholder="请输入不良编号"
+            placeholder="请输入不良编码"
             clearable
             :maxlength="20"
             size="small"
@@ -74,7 +74,8 @@
                 <div>Reject Code</div>
               </template>
               <template v-slot:default="scope">
-                {{ scope.row.rejectType || '-' }} {{ scope.row.rejectCode || '-' }}
+                {{ scope.row.rejectType || '-' }}-{{ scope.row.rejectCode || '-' }}
+<!--                {{ scope.row.rejectCode || '-' }}-->
               </template>
             </el-table-column>
             <el-table-column align="center" prop="rejectDescription" :show-overflow-tooltip="true">
@@ -84,6 +85,7 @@
               </template>
               <template slot-scope="scope">
                 {{ scope.row.rejectDescription || '-' }} / {{ scope.row.specificExplanation || '-' }}
+<!--                {{ scope.row.rejectDescription || '-' }}-->
               </template>
             </el-table-column>
             <el-table-column align="center" width="200" prop="createDate" :show-overflow-tooltip="true">
@@ -173,9 +175,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item class="labelHeight" label="不良编号" prop="rejectCode">
+              <el-form-item class="labelHeight" label="不良编码" prop="rejectCode">
                 <div slot="label" class="labelClassRequired">
-                  <div class="labelName">不良编号</div>
+                  <div class="labelName">不良编码</div>
                   <div class="labelName">Reject Code</div>
                 </div>
                 <el-row>
@@ -183,7 +185,7 @@
                     <el-input v-model="form.rejectTypes" type="text" :disabled="true" />
                   </el-col>
                   <el-col :span="16">
-                    <el-input v-model.trim="form.rejectCode" :maxlength="20" placeholder="请输入不良编号" />
+                    <el-input v-model.trim="form.rejectCode" :maxlength="20" placeholder="请输入不良编码" />
                   </el-col>
                 </el-row>
               </el-form-item>
@@ -258,8 +260,7 @@
             <em>点击上传</em>
           </div>
           <div slot="tip" class="el-upload__tip">
-            <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-            <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+            <el-link type="primary" style="font-size:14px" @click="importTemplate">下载模板</el-link>
           </div>
           <div slot="tip" class="el-upload__tip" style="color:red">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
         </el-upload>
@@ -325,7 +326,7 @@ export default {
           { required: true, message: '请选择不良类型', trigger: 'change' }
         ],
         rejectCode: [
-          { required: true, message: '请输入不良编号', trigger: 'blur' },
+          { required: true, message: '请输入不良编码', trigger: 'blur' },
           { min: 1, max: 20, message: '长度在 1 到 20 个字符', trigger: 'blur' }
         ],
         rejectDescription: [
@@ -569,7 +570,7 @@ export default {
         rejectCode: this.queryParams.rejectCode,
         rejectDescription: this.queryParams.rejectDescription
       }
-      this.$confirm('是否确认导出所有用户信息?', '警告', {
+      this.$confirm('是否确认导出所有不良定义信息?', '警告', {
         confirmButtonText: '确定 Confirm',
         cancelButtonText: '取消 Cancel',
         cancelButtonClass: 'btn-custom-cancel',