询价单离线合同零件类型

src/api/PurchasingCenter/CreateInquirySheet.js

@@ -55,14 +55,14 @@ export function getExport2(num) {
   })
 }
 // 查询分配后的标准件和外购件
-export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6) {
+export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val7) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '采购管理_采购部采购_查询物料_分配后',
-      param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}`,
+      param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&零件类型=${val7}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })

src/api/PurchasingCenter/OfflineContract.js

@@ -171,14 +171,14 @@ export function setSafeValue(...params) {
   })
 }
 // 查询分配后的标准件和外购件
-export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person) {
+export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, type) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '采购管理_采购部采购_查询物料_分配后',
-      param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}`,
+      param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&零件类型=${type}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })

src/views/PurchasingCenter/CreateInquirySheet/index.vue

@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="24">
         <el-tabs v-model="tabName" type="border-card" @tab-click="tabClick">
-          <el-tab-pane label="标准件和外购件" name="标准件和外购件">
+          <el-tab-pane label="外购件" name="外购件">
             <el-row style="margin-bottom: 5px">
               <span>项目名称:</span>
               <el-select v-model="projectValue" style="width:200px" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
@@ -809,7 +809,7 @@ export default {
           value: 2
         }
       ],
-      tabName: '标准件和外购件',
+      tabName: '外购件',
       baseInfoLoading: false,
       dialogVisible5: false,
       form3: { // 询价单基础信息表单
@@ -868,7 +868,7 @@ export default {
       materialName: '',
       materialSpec: '',
       materialModel: '',
-      tableData11: [], // 标准件和外购件列表
+      tableData11: [], // 外购件列表
       total11: 0,
       pageCurrent11: 1,
       pageSize11: 10,
@@ -996,7 +996,7 @@ export default {
             const data2 = res2.data.map(v => filterVal2.map(j => v[j]))
             dataGroup.push(data2)
             const headerGroup = [['任务分配时间', '项目名称', '机床图号', '组号', '名称', '图号或型号', '规格', '待询价数量', '备注', '供货商'], ['任务分配时间', '项目名称', '机床图号', '组号', '名称', '图号或型号', '规格', '材料', '待询价数量', '备注', '供货商']]
-            const sheetGroup = ['标准件和外购件（未询价）', '基本件（未询价）']
+            const sheetGroup = ['外购件（未询价）', '基本件（未询价）']
             excel.export_json_to_excel({
               headerGroup: headerGroup,
               dataGroup: dataGroup,
@@ -1149,7 +1149,7 @@ export default {
     filterHandler(value, row) { // 筛选供货商
       return row['供货商'] === value
     },
-    searchTable11() { // 查询标准件和外购件列表
+    searchTable11() { // 查询外购件列表
       let check1, check2, check3, check4, check5, check6
       this.materialName ? check1 = 1 : check1 = 0
       this.materialSpec ? check2 = 1 : check2 = 0
@@ -1157,7 +1157,7 @@ export default {
       this.projectValue ? check4 = 1 : check4 = 0
       this.machineValue ? check5 = 1 : check5 = 0
       this.groupValue ? check6 = 1 : check6 = 0
-      searchMaterial(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue).then(response => {
+      searchMaterial(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, 2).then(response => {
         this.tableData11 = response.data.rows
         this.total11 = response.data.total
         const remark = []

src/views/PurchasingCenter/OfflineContract/index.vue

@@ -1360,7 +1360,7 @@ export default {
       this.materialName ? check1 = 1 : check1 = 0
       this.materialSpec ? check2 = 1 : check2 = 0
       this.materialModel ? check3 = 1 : check3 = 0
-      searchMaterial(this.pageCurrent00, this.pageSize00, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id).then(response => {
+      searchMaterial(this.pageCurrent00, this.pageSize00, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, 1).then(response => {
         this.tableData00 = response.data.rows
         this.total00 = response.data.total
         const remark = []