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

src/views/Assembly/QualityInspectionInformationInquiry/index.vue

@@ -1056,7 +1056,6 @@ export default {
       this.$refs['form2'].validate((valid) => {
         if (valid) {
           this.AddTableData_disable = true
-
           submitTable(this.form2.工序, this.form2.质检类型, this.form2.检测数, this.form2.质检情况, this.id, this.form2.不合格数量, this.form2.不合格原因, this.form2.不合格处理, this.form2.备注, this.form2.操作工, this.$store.state.user.id).then(response => {
             if (response.data[0].result === '1') {
               this.dialogFormVisible10 = false

src/views/Inventory/MaterialOut/index.vue

@@ -6,7 +6,7 @@
           <span slot="label">领料单</span>
           <div style="margin-top: 2px;margin-bottom: 2px">
             <!--<span style="margin: 5px">领料单编号:</span>-->
-            <el-input v-model="pickingListNumber" placeholder="领料单编号或领料人" clearable size="small" style="width:200px" />
+            <el-input v-model="pickingListNumber" placeholder="领料单编号/领料人/机床号" clearable size="small" style="width:200px" />
             <span style="margin: 5px">创建时间:</span>
             <el-date-picker
               v-model="dateRange"
@@ -35,7 +35,7 @@
                     {{ scope.row.姓名 }}
                   </template>
                 </el-table-column>
-                <el-table-column label="备注" prop="备注" show-overflow-tooltip align="center" min-width="140px">
+                <el-table-column label="机床" prop="备注" show-overflow-tooltip align="center" min-width="140px">
                   <template slot-scope="scope">
                     {{ scope.row.领料单备注 }}
                   </template>

src/views/Inventory/MaterialOut/index2.vue

@@ -1,17 +1,23 @@
 <template>
   <div class="app-container">
     <div style="margin-top: 2px;margin-bottom: 2px">
-      <el-input v-model="pickingListNumber" placeholder="图号或型号" clearable size="small" style="width:200px" />
+      <el-input v-model="pickingListNumber" placeholder="名称或图号或型号或规格" clearable size="small" style="width:200px" />
       <el-button size="small" type="primary" icon="el-icon-search" style="margin: 0 0 0 10px" plain @click="searchList()">查询</el-button>
       <el-button size="small" style="margin-left: 100px" type="distribution" @click="inputPassword()">领料确认</el-button>
     </div>
-    <el-table v-loading="loading1" :data="pickListTable2" :row-class-name="tableRowClassName1" highlight-current-row border style="width: 1000px" size="mini" height="600" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading1" :data="pickListTable2" :row-class-name="tableRowClassName1" highlight-current-row border style="width: 1015px" size="mini" height="600" @selection-change="handleSelectionChange">
-      <el-table-column label="名称" show-overflow-tooltip prop="名称" align="center" width="90">
+      <el-table-column align="center" type="selection" width="50"/>
+      <el-table-column label="领料单编号" show-overflow-tooltip prop="名称" align="center" width="150">
+        <template slot-scope="scope">
+          {{ scope.row.领料单编号 }}
+        </template>
+      </el-table-column>
+      <el-table-column label="名称" show-overflow-tooltip prop="名称" align="center" width="110">
         <template slot-scope="scope">
           {{ scope.row.名称 }}
         </template>
       </el-table-column>
-      <el-table-column label="图号或型号" prop="图号或型号" align="center" width="110" show-overflow-tooltip>
+      <el-table-column label="图号或型号" prop="图号或型号" align="center" width="120" show-overflow-tooltip>
         <template slot-scope="scope">
           {{ scope.row.图号或型号 || '—' }}
         </template>
@@ -136,7 +142,8 @@ export default {
       rules3: {
         password: [{ required: true, message: '请输入' }],
         outTypeValue: [{ required: true, message: '请选择' }]
-      }
+      },
+      multipleSelection1: []
     }
   },
   methods: {
@@ -215,10 +222,7 @@ export default {
     },
     // 多选
     handleSelectionChange(val) {
-      this.multipleSelection1 = []
+      this.multipleSelection1 = val
-      val.map(v => {
-        this.multipleSelection1.push(v.领料单明细流水号)
-      })
     },
     // 领料确认
     inputPassword() {
@@ -251,18 +255,17 @@ export default {
       this.machineValue = []
       this.offlineNum = []
       this.outNumber = []
-      for (let i = 0; i < this.pickListTable2.length; i++) {
+      for (let i = 0; i < this.multipleSelection1.length; i++) {
-        console.log(this.pickListTable2[i].出库数量, 1233)
+        if (this.multipleSelection1[i].出库数量 !== 0) {
-        if (this.pickListTable2[i].出库数量 !== 0) {
+          this.multipleSelection.push(this.multipleSelection1[i].领料单明细流水号)
-          this.multipleSelection.push(this.pickListTable2[i].领料单明细流水号)
+          this.basePartNum.push(this.multipleSelection1[i].基本件流水号)
-          this.basePartNum.push(this.pickListTable2[i].基本件流水号)
+          this.materialNum.push(this.multipleSelection1[i].物料流水号)
-          this.materialNum.push(this.pickListTable2[i].物料流水号)
+          this.parchasePartNum.push(this.multipleSelection1[i].标准件和外购件流水号)
-          this.parchasePartNum.push(this.pickListTable2[i].标准件和外购件流水号)
+          this.purchaseBillNum.push(this.multipleSelection1[i].请购单明细流水号)
-          this.purchaseBillNum.push(this.pickListTable2[i].请购单明细流水号)
+          this.groupNumValue.push(this.multipleSelection1[i].组件流水号)
-          this.groupNumValue.push(this.pickListTable2[i].组件流水号)
+          this.machineValue.push(this.multipleSelection1[i].机床流水号)
-          this.machineValue.push(this.pickListTable2[i].机床流水号)
+          this.offlineNum.push(this.multipleSelection1[i].离线采购件流水号)
-          this.offlineNum.push(this.pickListTable2[i].离线采购件流水号)
+          this.outNumber.push(this.multipleSelection1[i].出库数量)
-          this.outNumber.push(this.pickListTable2[i].出库数量)
         }
       }
       if (Number(this.form3.password) === Number(this.form3.DirectNote)) {

src/views/TechnologyCenter/QueryParts/index.vue

@@ -144,16 +144,16 @@
             {{ scope.row.操作日期 | formatTime }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="100">
+        <!--<el-table-column label="操作" fixed="right" align="center" width="100">-->
-          <template slot-scope="scope">
+        <!--<template slot-scope="scope">-->
-            <el-button
+        <!--<el-button-->
-              :disabled="Number(id)!==0"
+        <!--:disabled="Number(id)!==0"-->
-              size="mini"
+        <!--size="mini"-->
-              type="text"
+        <!--type="text"-->
-              icon="el-icon-delete"
+        <!--icon="el-icon-delete"-->
-              @click="handleDelete(scope.row)"/>
+        <!--@click="handleDelete(scope.row)"/>-->
-          </template>
+        <!--</template>-->
-        </el-table-column>
+        <!--</el-table-column>-->
       </el-table>
       <div class="block" style="margin-top: 10px;">
         <el-pagination