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

src/api/Assembly/QualityInspectionInformationInquiry.js

@@ -109,6 +109,21 @@ export function searchprocedure(num) {
     }
   })
 }
+// 投产数量查询
+export function searchproceductnum(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '质检管理_投产数量_查询数据',
+      param: '工艺计划流水号=' + num
+    }
+  })
+}
+
 // 操作工查询
 export function searchoperators(num) {
   return request({

src/views/Assembly/QualityInspectionInformationInquiry/index.vue

@@ -124,7 +124,7 @@
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="质检数量" align="center" width="120px">
+        <el-table-column label="检测数量" align="center" width="120px">
           <template slot-scope="scope">
             <template v-if="scope.row.edit">
               <el-input-number v-model="scope.row.数量" :min="0" :max="scope.row.零件数量" :step="1" style="width: 90%" size="mini"/>
@@ -134,7 +134,7 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column label="是否合格" align="center" width="120px">
+        <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="mini" style="width: 100%">
@@ -156,7 +156,7 @@
               <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 }}
+              {{ scope.row.不合格数量 = '' }}
             </template>
             <template v-else>
               {{ scope.row.不合格数量 }}
@@ -636,7 +636,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="检测数" prop="检测数">
-              <el-input-number v-model="form2.检测数" :min="0" :step="1" placeholder="检测数" style="width:150px" size="small" clearable/>
+              <el-input-number v-model="form2.检测数" :min="0" :max="proceductnummax" :step="1" placeholder="检测数" style="width:150px" size="small" clearable/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -685,7 +685,7 @@
 </template>
 
 <script>
-import { initProject, searchgroup, selecttable, QualityType, searchPic, searchTableDetail, searchData, searchData1, processingStatus, initPerson, Prohibit, initDisqualificationTreatment, initReasonsForNonconformity, searchparts, searchprocedure, searchoperators, submitTable, confirmEdit } from '@/api/Assembly/QualityInspectionInformationInquiry'
+import { initProject, searchgroup, selecttable, QualityType, searchPic, searchTableDetail, searchData, searchData1, processingStatus, initPerson, Prohibit, initDisqualificationTreatment, initReasonsForNonconformity, searchparts, searchprocedure, searchoperators, submitTable, confirmEdit, searchproceductnum, deleterow } from '@/api/Assembly/QualityInspectionInformationInquiry'
 import { readFile } from '@/utils/request'
 import { mapGetters } from 'vuex'
 // import { mapGetters } from 'vuex'
@@ -756,7 +756,8 @@ export default {
       total: 0, // 总条数
       pageSize: 10, // 每页显示条数
       pageCurrent: 1, // 后台获取页
-      dialogmethod: false // false新增  true 编辑
+      dialogmethod: false, // false新增  true 编辑
+      proceductnummax: 0
       // total1: 0, // 总条数
       // pageSize1: 10, // 每页显示条数
       // pageCurrent1: 1, // 后台获取页
@@ -814,7 +815,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        confirmEdit(row.质检流水号, row.质检类型代码, row.零部件流水号, row.数量).then(response => {
+        deleterow(row.质检流水号, row.质检类型代码, row.零部件流水号, row.数量).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('删除成功')
             this.selecttable()
@@ -1029,6 +1030,9 @@ export default {
     partChange() {
       this.form2.工序 = ''
       this.procedureNum = []
+      searchproceductnum(this.form2.零件图号).then(response => {
+        this.proceductnummax = response.data[0].批次数量
+      })
       searchprocedure(this.form2.零件图号).then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.procedureNum.push({

src/views/Inventory/CreatePickingList/index.vue

@@ -406,9 +406,32 @@
               :value="item.value"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="领料单备注" prop="领料单备注" label-width="100px">
+        <el-form-item label="机床图号" prop="机床图号" label-width="100px">
-          <el-input v-model="form1.领料单备注" size="small" placeholder="备注" style="width: 200px"/>
+          <el-select v-model="form1.机床图号" filterable placeholder="选择机床图号" size="small" clearable @change="machineChange1()">
+            <el-option
+              v-for="item in machineNumber"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+              <div style="float: left">{{ item.label }}</div>
+              <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
+            </el-option>
+          </el-select>
         </el-form-item>
+        <el-form-item label="组号" prop="组号" label-width="100px">
+          <el-select v-model="form1.组号" filterable placeholder="选择组号" size="small" clearable @change="sss()">
+            <el-option
+              v-for="item in groupNumber"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+        </el-form-item>
+        <!--<el-form-item label="领料单备注" prop="领料单备注" label-width="100px">-->
+        <!--&lt;!&ndash;<el-input v-model="form1.领料单备注" size="small" placeholder="备注" style="width: 200px"/>&ndash;&gt;-->
+        <!--<span> {{ form1.领料单备注 }}</span>-->
+        <!--</el-form-item>-->
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible1=false">取消</el-button>
@@ -482,7 +505,9 @@ export default {
       materialModel: '', // 物料型号
       form1: {
         领料人流水号: '',
-        领料单备注: ''
+        领料单备注: '',
+        机床图号: '',
+        组号: ''
       },
       rules1: {
         领料人流水号: [{ required: true, message: '请选择制单人' }]
@@ -512,6 +537,41 @@ export default {
     // this.startTime = [get90DAY(). getNowDAY()]
   },
   methods: {
+    sss() {
+      let obj = {}
+      obj = this.machineNumber.find((item) => {
+        return item.value === this.form1.机床图号
+      })
+      console.log(obj.label, this.form1.组号)
+      this.form1.领料单备注 = obj.label + '-' + this.form1.组号
+    },
+    // // 加载机床号
+    // initProject() {
+    //   initMachineProject().then(response => {
+    //     for (let i = 0; i < response.data.length; i++) {
+    //       this.machineNumber.push({
+    //         label: response.data[i].机床图号,
+    //         name: response.data[i].项目名称,
+    //         value: response.data[i].机床流水号
+    //       })
+    //     }
+    //   })
+    // },
+    // 组号
+    machineChange1() {
+      this.groupNumberValue = ''
+      this.groupNumber = []
+      searchgroup(this.form1.机床图号).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.groupNumber.push({
+            label: response.data[i].组号,
+            // value: response.data[i].组件流水号
+            value: response.data[i].组号
+
+          })
+        }
+      })
+    },
     // 审批通过
     approvalPass(row) {
       this.$confirm('是否审批通过?', '提示', {