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

src/api/Assembly/QualityInspectionInformationInquiry.js

@@ -150,6 +150,20 @@ export function confirmEdit(...param) {
     }
   })
 }
+
+export function deleterow(...param) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '2',
+      name: '车间生产管理_质检管理_删除处理',
+      param: `质检流水号=${param[0]}&质检类型代码=${param[1]}&零部件流水号=${param[2]}&数量=${param[3]}`
+    }
+  })
+}
 // 质检管理_质量情况_查询数据
 export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8, pageCurrent, pageSize) {
   return request({

src/views/Assembly/QualityInspectionInformationInquiry/index.vue

@@ -59,7 +59,7 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-button type="primary" size="small" icon="el-icon-search" style="margin-left: 15px;margin-top: 5px" plain @click="pageSize=20; pageCurrent= 1;selecttable()">查询</el-button>
+        <el-button type="primary" size="small" icon="el-icon-search" style="margin-left: 15px;margin-top: 5px" plain @click="pageSize=10; pageCurrent= 1;selecttable()">查询</el-button>
         <el-tooltip :open-delay="1000" effect="dark" content="导出查询数据" placement="top">
           <el-button type="warning" size="small" icon="el-icon-download" plain style="margin-left:10px" @click="exportExcel()">导出</el-button>
         </el-tooltip>
@@ -137,7 +137,7 @@
         <el-table-column label="是否合格" align="center" width="120px">
           <template slot-scope="scope">
             <template v-if="scope.row.edit">
-              <el-select v-model="scope.row.是否合格" placeholder="请选择" filterable size="small" style="width: 100%">
+              <el-select v-model="scope.row.是否合格" placeholder="请选择" filterable size="mini" style="width: 100%">
                 <el-option
                   v-for="item in qualityInspection"
                   :key="item.value"
@@ -153,7 +153,7 @@
         <el-table-column label="不合格数" align="center" width="120px">
           <template slot-scope="scope">
             <template v-if="scope.row.edit && scope.row.是否合格 === 2">
-              <el-input-number v-model="scope.row.不合格数量" :min="0" :step="1" style="width: 90%" size="mini"/>
+              <el-input-number v-model="scope.row.不合格数量" :min="0" :max="scope.row.数量" :step="1" style="width: 90%" size="mini"/>
             </template>
             <template v-else-if="scope.row.是否合格 === 1">
               {{ scope.row.不合格数量 =0 }}
@@ -166,7 +166,7 @@
         <el-table-column label="不合格原因" align="center" width="140px">
           <template slot-scope="scope">
             <template v-if="scope.row.edit && scope.row.是否合格 === 2">
-              <el-select v-model="scope.row.不合格原因" placeholder="请选择" filterable size="small" style="width: 100%">
+              <el-select v-model="scope.row.不合格原因" placeholder="请选择" filterable size="mini" style="width: 100%">
                 <el-option
                   v-for="item in reasonsForNonconformity"
                   :key="item.value"
@@ -185,7 +185,7 @@
         <el-table-column label="处理结果" align="center" width="140px" show-overflow-tooltip>
           <template slot-scope="scope">
             <template v-if="scope.row.edit && scope.row.是否合格 === 2">
-              <el-select v-model="scope.row.处理结果" placeholder="请选择" filterable size="small" style="width: 100%">
+              <el-select v-model="scope.row.处理结果" placeholder="请选择" filterable size="mini" style="width: 100%">
                 <el-option
                   v-for="item in disqualificationTreatment"
                   :key="item.value"
@@ -226,7 +226,7 @@
             {{ scope.row.编辑时间 ? scope.row.编辑时间.split(' ')[0] : scope.row.编辑时间 }}
           </template>
         </el-table-column>
-        <el-table-column label="形位" fixed="right" align="center" width="70">
+        <el-table-column label="形位" align="center" width="70">
           <template slot-scope="scope">
             <el-popover placement="right" width="500" trigger="click">
               <el-table :data="gridData" class="subTableHeader" highlight-current-row size="mini">
@@ -251,7 +251,7 @@
             </el-popover>
           </template>
         </el-table-column>
-        <el-table-column label="尺寸" fixed="right" align="center" width="70">
+        <el-table-column label="尺寸" align="center" width="70">
           <template slot-scope="scope">
             <el-popover placement="right" width="500" trigger="click">
               <el-table :data="gridData" class="subTableHeader" highlight-current-row size="mini">
@@ -276,7 +276,7 @@
             </el-popover>
           </template>
         </el-table-column>
-        <el-table-column label="外观" fixed="right" align="center" width="70">
+        <el-table-column label="外观" align="center" width="70">
           <template slot-scope="scope">
             <el-popover placement="right" width="500" trigger="click">
               <el-table :data="gridData" class="subTableHeader" highlight-current-row size="mini">
@@ -301,7 +301,7 @@
             </el-popover>
           </template>
         </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" min-width="150">
+        <el-table-column label="查看图片" align="center" width="100px">
           <template slot-scope="scope">
             <el-button
               v-if="!scope.row.edit"
@@ -310,6 +310,10 @@
               plain
               icon="el-icon-search"
               @click="viewPicture(scope.row)">查看图片</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" align="center" min-width="100">
+          <template slot-scope="scope">
             <el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block;margin-right: 10px">
                 <el-button v-if="!scope.row.edit" type="text" size="mini" icon="el-icon-edit" @click="scope.row.edit=!scope.row.edit"/>
@@ -750,7 +754,7 @@ export default {
       AddTableData_disable: false,
       loading: false,
       total: 0, // 总条数
-      pageSize: 20, // 每页显示条数
+      pageSize: 10, // 每页显示条数
       pageCurrent: 1, // 后台获取页
       dialogmethod: false // false新增  true 编辑
       // total1: 0, // 总条数
@@ -791,22 +795,34 @@ export default {
     },
     // 表内编辑确定
     confirmEdit(row) {
-      console.log(row, 676767)
-
       confirmEdit(row.质检流水号, row.质检类型代码, row.零部件流水号, row.是否合格, row.数量, row.不合格数量, row.不合格原因, row.处理结果, row.备注, this.$store.state.user.id).then(response => {
         if (response.data[0].result === '1') {
-          this.dialogFormVisible10 = false
           this.$message.success('编辑成功')
           this.selecttable()
         } else {
           this.$message.error('编辑失败')
         }
       })
-      this.selecttable()
       row.edit = false
     },
+    // 删除质检
     deleterow(row) {
       // this.plan = row.计划流水号
+      console.log(row, 4545)
+      this.$confirm('是否删除该质检记录?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        confirmEdit(row.质检流水号, row.质检类型代码, row.零部件流水号, row.数量).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('删除成功')
+            this.selecttable()
+          } else {
+            this.$message.error('编辑失败')
+          }
+        })
+      })
     },
     initProject() {
       initProject().then(response => {

src/views/Inventory/PickingListApproval/index.vue

@@ -172,7 +172,7 @@ export default {
         type: 'warning'
       }).then(() => {
         if (this.pickListTable2.length === 0) {
-          this.$message.error('空领料单，不能审批！')
+          this.$message.error('不能审批空领料单')
           return
         }
         const param = {

src/views/Outsourcing/OutsourcingPartsQuery/index.vue

@@ -11,7 +11,7 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-button icon="el-icon-search" type="primary" size="small" plain @click="pageCurrent = 1;pageSize = 50;getTableData()">查询</el-button>
+        <el-button icon="el-icon-search" type="primary" size="small" plain @click="getTableData()">查询</el-button>
         <el-button type="success" class="el-icon-download" size="small" style="margin: 10px 0 0 10px" plain @click="exportExcel">导出</el-button>
       </div>
     </el-card>
@@ -121,12 +121,18 @@ export default {
       }, {
         value: 1,
         label: '已到'
+      }, {
+        value: 2,
+        label: '未提交'
+      }, {
+        value: 3,
+        label: '未外协'
       }],
       tableData: [],
       procedure: [],
       procedureTime: [],
       pageCurrent: 1,
-      pageSize: 500,
+      pageSize: 50,
       tableData1: []
     }
   },