Merge branch 'dev-scheduling' of http://42.192.7.176:3000/suojin/jonhon-mes-web into dev-scheduling

src/api/qualityManagement/productionTesting/productionDisposition.js

@@ -4,7 +4,8 @@ import request from '@/axios';
 // 获取故障分类下拉
 export const getFaultClassList = (params) => {
   return request({
-    url: '/api/blade-desk/QA/Ng/listForSelectGZLB',
+    // url: '/api/blade-desk/QA/Ng/listForSelectGZLB',
+    url:"/api/blade-system/dict/dictionary?code=FAUL_TVPE",
     method: 'get',
     params
   });

src/views/productionDisposition/hearingDialog.vue

@@ -167,8 +167,8 @@
                             </template>
                             <template #default="scope">
                                 <el-select v-model="scope.row.ngType2Id" :disabled="type == 'view'">
-                                    <el-option v-for="item in errorTypeArr" :key="item.id" :value="item.id"
-                                        :label="item.name"></el-option>
+                                    <el-option v-for="item in errorTypeArr" :key="item.id" :value="item.dictKey"
+                                        :label="item.dictValue"></el-option>
                                 </el-select>
                             </template>
                         </el-table-column>

src/views/productionDisposition/index.vue

@@ -600,6 +600,7 @@ export default {
             this.page.currentPage = 1;
             this.query.createTimeStart = params.createTime && params.createTime.length != 0 && params.createTime[0]
             this.query.createTimeEnd = params.createTime && params.createTime.length != 0 && params.createTime[1]
+            if(this.query.createTime) delete this.query.createTime
             this.onLoad(this.page, params);
             done();
         },

src/views/productionTesting/components/trialItem.vue

@@ -365,7 +365,7 @@ export default {
 </script>
 
 <style scoped>
-.trial-item-container {
+/* .trial-item-container {
   height: calc(100vh - 200px);
   overflow-y: auto;
 }
@@ -375,7 +375,6 @@ export default {
   padding-bottom: 10px;
 }
 .trial-item-container :deep(.el-table) {
-  /* max-height: none !important; */
   height: 300px !important;
-}
+} */
 </style>

src/views/productionTesting/inspectionItem.vue

@@ -2,17 +2,14 @@
   <basic-container>
     <el-tabs
       v-model="activeName"
-     
       class="demo-tabs"
       @tab-click="handleClick"
     >
-      <el-tab-pane label="项目" name="trialItem">
-        <trial-item></trial-item>
-      </el-tab-pane>
-      <el-tab-pane label="标准" name="trialStandard">
-        <trial-standard></trial-standard>
-      </el-tab-pane>
+      <el-tab-pane label="项目" name="trialItem"></el-tab-pane>
+      <el-tab-pane label="标准" name="trialStandard"></el-tab-pane>
     </el-tabs>
+     <trial-item v-if="activeName == 'trialItem'"></trial-item>
+     <trial-standard v-if="activeName == 'trialStandard'"></trial-standard>
   </basic-container>
 </template>