Merge branch 'master' of http://123.56.95.229:10010/r/高精

src/api/Assembly/QualityInspectionInformationInquiry.js

@@ -148,8 +148,7 @@ export function selecttable(check1, value1, check2, value2, check3, value3, chec
       type: '1',
       name: '质检管理_质量情况_查询数据',
       param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件名称_check=' + check3 + '&零件名称=' + value3 +
-        '&质检类型代码_check=' + check4 + '&质检类型代码=' + value4 + '&开始时间_check=' + check5 + '&开始时间=' + value5 + '&结束时间_check=' + check6 + '&结束时间=' + value6 + '&质检情况_check=' + check7 + '&质检情况=' + value7 + '&人员编号_check=' + check8 + '&人员编号=' + value8,
+        '&质检类型代码_check=' + check4 + '&质检类型代码=' + value4 + '&开始时间_check=' + check5 + '&开始时间=' + value5 + '&结束时间_check=' + check6 + '&结束时间=' + value6 + '&质检情况_check=' + check7 + '&质检情况=' + value7 + '&人员编号_check=' + check8 + '&人员编号=' + value8 + `8&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
-      Pagination: pageCurrent + '&' + pageSize
     }
   })
 }

src/views/Assembly/QualityInspectionInformationInquiry/index.vue

@@ -67,7 +67,7 @@
       </el-row>
     </el-card>
     <el-card>
-      <el-table v-loading="loading" :data="tableData1" border size="mini" highlight-current-row style="width: 100%" stripe height="475px">
+      <el-table v-loading="loading" :data="tableData1" element-loading-text="质检数据较多，请耐心等候..." border size="mini" highlight-current-row style="width: 100%" stripe height="475px">
         <el-table-column align="center" label="禁用情况" width="80px">
           <template slot-scope="scope">
             <el-tag v-if="parseInt(scope.row.是否禁用)===0||scope.row.是否禁用===''" type="success" size="small" @click="approvalPass(scope.row)">未禁用</el-tag>
@@ -908,11 +908,9 @@ export default {
       if (this.qualityInspectionValue !== '' && this.qualityInspectionValue !== null) { this.check7 = 1 } else { this.check7 = 0 }
       if (this.personNum !== '' && this.personNum !== null) { this.check8 = 1 } else { this.check8 = 0 }
       selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts, this.check4, this.QualityTypeValue, this.check5, this.startTime, this.check6, this.endTime, this.check7, this.qualityInspectionValue, this.check8, this.personNum, this.pageCurrent, this.pageSize).then(response => {
-        console.log(response.data.rows, 111)
+        this.tableData1 = response.data.result
-        this.tableData1 = response.data.rows
         this.loading = false
-        this.total = response.data.total
+        this.total = parseInt(response.data.output[0].ItemCount)
-        console.log(this.tableData1)
       })
     },
     viewPicture(row) {

src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue

@@ -246,7 +246,7 @@ export default {
 
 <style>
   .el-table .cjzuwcqk_complet {
-    background: #67C23A;
+    background: #9bd7fc !important;
   }
 </style>
 <style lang="scss">
@@ -260,7 +260,7 @@ export default {
   }
   .treeNotesComplate {
     color: black;
-    background-color: #67C23A;
+    background-color: #9bd7fc !important;
   }
   .treeNotesUnComplate {
     color: black;

src/views/ManufacturingCenter/MachiningParts/index.vue

@@ -161,16 +161,22 @@
         </el-table-column>
         <el-table-column align="center" label="工序完成" width="80">
           <template slot-scope="scope">
-            <el-tag v-if="parseInt(scope.row.工序状态)===4" type="success" size="small">已完</el-tag>
+            <span v-if="parseInt(scope.row.工序状态)===4" style="color: #67C23A">已完</span>
-            <el-tag v-if="parseInt(scope.row.工序状态)===5" type="warning" size="small">报废</el-tag>
+            <span v-if="parseInt(scope.row.工序状态)===5" style="color: #E6A23C">报废</span>
-            <el-tag v-if="parseInt(scope.row.工序状态)!==4 && parseInt(scope.row.工序状态)!==5" type="primary" size="small">未完</el-tag>
+            <span v-if="parseInt(scope.row.工序状态)!==4 && parseInt(scope.row.工序状态)!==5" style="color: #409EFF">未完</span>
+            <!--<el-tag v-if="parseInt(scope.row.工序状态)===4" type="success" size="small">已完</el-tag>-->
+            <!--<el-tag v-if="parseInt(scope.row.工序状态)===5" type="warning" size="small">报废</el-tag>-->
+            <!--<el-tag v-if="parseInt(scope.row.工序状态)!==4 && parseInt(scope.row.工序状态)!==5" type="primary" size="small">未完</el-tag>-->
           </template>
         </el-table-column>
         <el-table-column align="center" label="工序质检" width="80">
           <template slot-scope="scope">
-            <el-tag v-if="parseInt(scope.row.是否质检)===1" type="success" size="small">合格</el-tag>
+            <span v-if="parseInt(scope.row.是否质检)===1" style="color: #67C23A">合格</span>
-            <el-tag v-if="parseInt(scope.row.是否质检)===2" type="warning" size="small">不合格</el-tag>
+            <span v-if="parseInt(scope.row.是否质检)===2" style="color: #E6A23C">不合格</span>
-            <el-tag v-if="parseInt(scope.row.是否质检)!==1 && parseInt(scope.row.是否质检)!==2" type="primary" size="small">未检</el-tag>
+            <span v-if="parseInt(scope.row.是否质检)!==1 && parseInt(scope.row.是否质检)!==2" style="color: #409EFF">未检</span>
+            <!--<el-tag v-if="parseInt(scope.row.是否质检)===1" type="success" size="small">合格</el-tag>-->
+            <!--<el-tag v-if="parseInt(scope.row.是否质检)===2" type="warning" size="small">不合格</el-tag>-->
+            <!--<el-tag v-if="parseInt(scope.row.是否质检)!==1 && parseInt(scope.row.是否质检)!==2" type="primary" size="small">未检</el-tag>-->
           </template>
         </el-table-column>
       </el-table>