获取零件下拉接口修改

src/api/basicData/outsourcingAssignmentControl.js

@@ -26,10 +26,12 @@ export const getProcessAbility = params =>
   });
 
 // 零件下拉
-export const getPartList = () =>{
+export const getPartList = (params) =>{
     return request({
-      url:'/api/blade-desk/dsPart/getPartList',
+      // url:'/api/blade-desk/dsPart/getPartList',
-      method:'get'
+      url:"/api/blade-desk/dsPart/listNew",
+      method:'get',
+      params
     })
   }
 

src/api/orderManagement/exceptionOrder.js

@@ -55,7 +55,8 @@ export const verificationData = (params) =>{
 // 零件下拉
 export const getPartList = (params) => {
   return request({
-    url: '/api/blade-desk/dsPart/getPartList',
+    // url: '/api/blade-desk/dsPart/getPartList',
+    url: '/api/blade-desk/dsPart/listNew',
     method: 'get',
     params
   });

src/api/orderManagement/moldPlan.js

@@ -66,10 +66,12 @@ export const getListpageNearlyMonth = (current, size, params) => {
 };
 
 // 零件下拉
-export const getPartList = () =>{
+export const getPartList = (params) =>{
   return request({
-    url:'/api/blade-desk/dsPart/getPartList',
+    // url:'/api/blade-desk/dsPart/getPartList',
-    method:'get'
+    url: '/api/blade-desk/dsPart/listNew',
+    method:'get',
+    params
   })
 }
 

src/api/qualityManagement/remindRedeem/remindRedeem.js

@@ -45,10 +45,12 @@ export const deleteRemind = (params) =>{
 }
 
 // 零件下拉
-export const getPartList = () =>{
+export const getPartList = (params) =>{
   return request({
-    url:'/api/blade-desk/dsPart/getPartList',
+    // url:'/api/blade-desk/dsPart/getPartList',
-    method:'get'
+    url:"/api/blade-desk/dsPart/listNew",
+    method:'get',
+    params
   })
 }
 

src/views/oem/outsourcingAssignmentControl/index.vue

@@ -31,12 +31,12 @@
         </el-select>
       </template>
       <template #dsPart="scope">
-        <el-select v-model="scope.row.dsPart">
+        <el-select v-model="scope.row.dsPart" remote :remote-method="(query) => queryPart(query,scope.index)" filterable :loading="partLoading">
           <el-option v-for="item in partData" :key="item.id" :label="item.partCode" :value="item.id"></el-option>
         </el-select>
       </template>
       <template #assignScale="scope">
-        <el-input-number v-model="scope.row.assignScale" controls-position="right"></el-input-number>
+        <el-input-number style="width:98%;" v-model="scope.row.assignScale" controls-position="right"></el-input-number>
       </template>
       <template #menu-right>
         <!-- <el-button type="primary" icon="el-icon-printer" @click="handleDelete">打印
@@ -133,6 +133,7 @@ export default {
             sortable: true,
             filter: true,
             span: 24,
+            width: 150,
             search: false,
             type: "select",
             rules: [{ required: true, message: "请输入分派比例", trigger: "blur" }],
@@ -144,6 +145,7 @@ export default {
             sortable: true,
             filter: true,
             span: 24,
+            width: 150,
             type: "select",
             search: true,
             filterable: true,
@@ -175,6 +177,7 @@ export default {
             filter: true,
             span: 24,
             search: false,
+            width: 150,
             // cell: true,
             // type: "select",
             // dicData: [
@@ -192,6 +195,7 @@ export default {
           {
             label: "分派比例(%)",
             prop: "assignScale",
+            width: 150,
             sortable: true,
             filter: true,
             span: 24,
@@ -205,6 +209,7 @@ export default {
             prop: "assign",
             sortable: true,
             filter: true,
+            width: 150,
             span: 24,
             search: false,
           },
@@ -237,13 +242,14 @@ export default {
           },
         ],
       },
-      selectionList:[]
+      selectionList:[],
+      partLoading:false,
     };
   },
   mounted() {
     this.getSupplierData()
     this.getAbility()
-    this.getPartData()
+    // this.getPartData()
   },
   methods: {
     selectionChange(list){
@@ -319,6 +325,42 @@ export default {
         this.abilityData = res.data.data
       })
     },
+    queryPart(query,index){
+      console.log('query----------------',query)
+      console.log('index----------------',index)
+      this.partLoading = true
+      if(query){
+        getPartList({
+          current:1,
+          size:50,
+          partCode:query
+        }).then(res =>{
+          this.partData = res.data.data.records
+          this.partLoading = false
+        })
+      }else{
+        getPartList({
+          current:1,
+          size:50,
+        }).then(res =>{
+          this.partData = res.data.data.records
+          let tmp = this.partData.find(item => item.id == this.data[index].dsPart)
+          if(!tmp){
+            getPartList({
+              current:1,
+              size:50,
+              partCode:this.data[index].partCode
+            }).then(res =>{
+              this.partData = [...this.partData,...res.data.data.records]
+              this.partLoading = false
+
+            })
+          }else{
+            this.partLoading = false
+          }
+        })
+      }
+    },
     getPartData(){
       getPartList().then(res =>{
         this.partData = res.data.data

src/views/orderManagement/components/exception/dataMissing.vue

@@ -63,7 +63,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="零件号" prop="partCode">
-            <el-select v-model="editForm.partCode" placeholder="请选择零件号" @change="changePart">
+            <el-select v-model="editForm.partCode" remote :remote-method="queryCode" filterable :loading="partLoading" placeholder="请选择零件号" @change="changePart">
               <el-option v-for="item in partCodeList" :key="item.partCode" :label="item.partCode" :value="item.partCode"></el-option>
             </el-select>
           </el-form-item>
@@ -304,18 +304,18 @@ export default {
           {
             label: '零件号',
             prop: 'partCode',
-            type:"select",
+            // type:"select",
             search: false,
             sortable: true,
             width: 150,
             span: 12,
             headerAlign: 'center',
             align: 'center',
-            dicUrl:'/api/blade-desk/dsPart/getPartList',
+            // dicUrl:'/api/blade-desk/dsPart/getPartList',
-            props:{
+            // props:{
-              label: 'partCode',
+            //   label: 'partCode',
-              value:'partCode'
+            //   value:'partCode'
-            },
+            // },
             // onChange:val =>{
             //   this.form.partName = val && val.item && val.item.partName
             // },
@@ -638,6 +638,7 @@ export default {
       },
 
       data: [],
+      partLoading:false,
       
     };
   },
@@ -645,12 +646,57 @@ export default {
   methods: {
     async editData(row){
       this.editForm = JSON.parse(JSON.stringify(row))
-      const partRes = await getPartList()
+      const partRes = await getPartList({
-      this.partCodeList = partRes.data.data
+        current:1,
+        size:50
+      })
+      this.partCodeList = partRes.data.data.records
+      let tmp = this.partCodeList.find(item => item.partCode == row.partCode)
+      if(!tmp){
+        const partRes = await getPartList({
+          current:1,
+          size:50,
+          partCode:row.partCode
+        })
+        this.partCodeList = [...this.partCodeList,...partRes.data.data.records]
+      }
       const productRes = await getProductionIdentificationList()
       this.productIdentList = productRes.data.data
       this.isEdit = true
     },
+    queryCode(query){
+      this.partLoading = true
+      if(query){
+        getPartList({
+          current:1,
+          size:50,
+          partCode:val
+        }).then(res=>{
+          this.partCodeList = res.data.data.records
+          this.partLoading = false
+        })
+      }else{
+        getPartList({
+          current:1,
+          size:50,
+        }).then(res =>{
+          this.partCodeList = res.data.data.records
+          let tmp = this.partCodeList.find(item => item.partCode == this.editForm.partCode)
+          if(!tmp){
+            getPartList({
+              current:1,
+              size:50,
+              partCode:this.editForm.partCode
+            }).then(res =>{
+              this.partCodeList = [...this.partCodeList,...res.data.data.records]
+              this.partLoading = false
+            })
+          }else{
+            this.partLoading = false
+          }
+        })
+      }
+    },
     changePart(val){
       let tmp = this.partCodeList.find(item => item.partCode == val)
       this.editForm.partName = tmp.partName

src/views/orderManagement/components/exception/deliveryDate.vue

@@ -185,21 +185,21 @@ export default {
           {
             label: '零件号',
             prop: 'partCode',
-            type:"select",
+            // type:"select",
             search: false,
             sortable: true,
             width: 150,
             span: 12,
             headerAlign: 'center',
             align: 'center',
-            dicUrl:'/api/blade-desk/dsPart/getPartList',
+            // dicUrl:'/api/blade-desk/dsPart/getPartList',
-            props:{
+            // props:{
-              label: 'partCode',
+            //   label: 'partCode',
-              value:'partCode'
+            //   value:'partCode'
-            },
+            // },
-            onChange:val =>{
+            // onChange:val =>{
-              this.form.partName = val.item.partName
+            //   this.form.partName = val.item.partName
-            },
+            // },
             rules: [
               {
                 required: true,

src/views/orderManagement/components/exception/processMissing.vue

@@ -206,21 +206,21 @@ export default {
           {
             label: '零件号',
             prop: 'partCode',
-            type:"select",
+            // type:"select",
             search: false,
             sortable: true,
             width: 150,
             span: 12,
             headerAlign: 'center',
             align: 'center',
-            dicUrl:'/api/blade-desk/dsPart/getPartList',
+            // dicUrl:'/api/blade-desk/dsPart/getPartList',
-            props:{
+            // props:{
-              label: 'partCode',
+            //   label: 'partCode',
-              value:'partCode'
+            //   value:'partCode'
-            },
+            // },
-            onChange:val =>{
+            // onChange:val =>{
-              this.form.partName = val.item.partName
+            //   this.form.partName = val.item.partName
-            },
+            // },
             rules: [
               {
                 required: true,

src/views/orderManagement/components/exception/resourceMissing.vue

@@ -195,21 +195,21 @@ export default {
           {
             label: '零件号',
             prop: 'partCode',
-            type:"select",
+            // type:"select",
             search: false,
             sortable: true,
             width: 150,
             span: 12,
             headerAlign: 'center',
             align: 'center',
-            dicUrl:'/api/blade-desk/dsPart/getPartList',
+            // dicUrl:'/api/blade-desk/dsPart/getPartList',
-            props:{
+            // props:{
-              label: 'partCode',
+            //   label: 'partCode',
-              value:'partCode'
+            //   value:'partCode'
-            },
+            // },
-            onChange:val =>{
+            // onChange:val =>{
-              this.form.partName = val.item.partName
+            //   this.form.partName = val.item.partName
-            },
+            // },
             rules: [
               {
                 required: true,

src/views/orderManagement/components/mold/addMoldDailog.vue

@@ -31,6 +31,9 @@
                 :filterable="true"
                 allow-create
                 :disabled="scope.row.disabled"
+                remote
+                :remote-method="queryPart"
+                :loading="partLoading"
                 @change="partCodeChange(scope.row.partCode, scope.$index)"
               >
                 <el-option
@@ -249,6 +252,7 @@ export default {
         quaLevel: [{ required: true, message: '请输入生产标识', trigger: ['blur', 'submit'] }],
         keeper: [{ required: true, message: '请选择保管员', trigger: ['change', 'submit'] }],
       },
+      partLoading:false,
     };
   },
   mounted() {
@@ -275,9 +279,33 @@ export default {
     },
   },
   methods: {
+    queryPart(query){
+      this.partLoading = true
+      if(query){
+        getPartList({
+          current:1,
+          size:50,
+          partCode:query
+        }).then(res =>{
+          this.partCodeList = res.data.data.records
+          this.partLoading = false
+        })
+      }else{
+        getPartList({
+          current:1,
+          size:50,
+        }).then(res =>{
+          this.partCodeList = res.data.data.records
+          this.partLoading = false
+        })
+      }
+    },
     getPart(){
-      getPartList().then(res =>{
+      getPartList({
-        this.partCodeList = res.data.data
+        current:1,
+        size:50
+      }).then(res =>{
+        this.partCodeList = res.data.data.records
       })
     },
     getQuaLevel(){

src/views/orderManagement/moldPlan.vue

@@ -2,12 +2,12 @@
   <basic-container>
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="模具需求" name="1">
-        <moldRequire v-if="activeName == '1'"></moldRequire>
       </el-tab-pane>
       <el-tab-pane label="申报记录" name="2">
-        <moldRecord v-if="activeName == '2'"></moldRecord>
       </el-tab-pane>
     </el-tabs>
+    <moldRecord v-if="activeName == '2'"></moldRecord>
+    <moldRequire v-if="activeName == '1'"></moldRequire>
   </basic-container>
 </template>
 

src/views/qualityManagement/remindRedeem/components/batchAdd.vue

@@ -32,6 +32,10 @@
                 v-model="scope.row.partId" 
                 placeholder="请选择"
                 style="width: 100%"
+                remote
+                :remote-method="queryPart"
+                :loading="partLoading"
+                filterable
                 @change="(val) => changePart(val,scope.$index)"
               >
                 <el-option
@@ -240,10 +244,11 @@ export default {
         },
         pqList:[],
         partData:[],
+        partLoading:false,
     };
   },
   mounted() {
-    this.getPart()
+    // this.getPart()
     this.openShow = this.showDialog;
     // this.getWorkCenterList();
     this.getPqData()
@@ -258,10 +263,36 @@ export default {
     }
   },
   methods: {
+    queryPart(query){
+      this.partLoading = true
+      if(query){
+        getPartList({
+          current:1,
+          size:50,
+          partCode:query
+        }).then(res =>{
+          console.log('res----------------',res)
+          this.partData = res.data.data.records
+          this.partLoading = false
+        })
+      }else{
+        getPartList({
+          current:1,
+          size:60
+        }).then(res =>{
+          console.log('res----------------',res)
+          this.partData = res.data.data.records
+          this.partLoading = false
+        })
+      }
+    },
     getPart(){
-      getPartList().then(res =>{
+      getPartList({
+        current:1,
+        size:50
+      }).then(res =>{
         console.log('res----------------',res)
-        this.partData = res.data.data
+        this.partData = res.data.data.records
       })
     },
     getSubPartList(val,index){

src/views/qualityManagement/remindRedeem/index.vue

@@ -1,11 +1,14 @@
 <template>
     <basic-container>
         
-        <avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud"
+        <avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" 
+            v-model:page="page" ref="crud"
+            v-model:search="searchParams"
             @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
             @row-update="rowUpdate"
             @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
-            @refresh-change="refreshChange" @on-load="onLoad">
+            @refresh-change="refreshChange" @on-load="onLoad"
+            :beforeOpen="beforeOpen">
             <template #menu-left>
                 <el-button type="primary" @click="handleAdd()">新增</el-button>
                 <el-button type="danger" @click="batchDel()">删除</el-button>
@@ -16,12 +19,20 @@
             <template #menu="{ row }">
 
             </template>
-            <template #partId-form="{type}">
+            <template #partCode-form="{type}">
-                <el-select v-if="type == 'edit'" placeholder="请选择零件" v-model="form.partId"
+                <el-select v-if="type == 'edit'" remote filterable :remote-method="queryPart"
+                 :loading="partLoading" placeholder="请选择零件" v-model="form.partId"
                 @change="changePart">
                     <el-option v-for="item in partData" :key="item.id" :label="item.partCode" :value="item.id"></el-option>
                 </el-select>
             </template>
+            <template #partCode-search="{ disabled, size }">
+                <el-select  remote filterable :remote-method="queryPart"
+                :loading="partLoading" placeholder="请选择零件" v-model="searchParams.partId"
+                >
+                    <el-option v-for="item in partData" :key="item.id" :label="item.partCode" :value="item.id"></el-option>
+                </el-select>
+            </template>
 
             <!-- <template #heatTreat="scope">
                 <el-tag v-if="scope.row.afterPlating" type="success">是</el-tag>
@@ -67,6 +78,7 @@ export default {
     data() {
         return {
             partData:[],
+            partLoading:false,
             isShowImport:false,
             inBatchesOpen: false,
             platingSmallOpen: false,
@@ -96,6 +108,7 @@ export default {
                 total: 0,
             },
             showDialog:false,
+            searchParams:{},
             option: {
                 columnSort: true,
                 tip: false,
@@ -141,7 +154,7 @@ export default {
                 column: [
                     {
                         label: '零件号',
-                        prop: 'partId',
+                        prop: 'partCode',
                         // bind: 'dsPart.partCode',
                         search: true,
                         sortable: true,
@@ -155,11 +168,13 @@ export default {
                                 trigger: 'blur',
                             },
                         ],
-                        dicUrl:'/api/blade-desk/dsPart/getPartList',
+                        // dicUrl:'/api/blade-desk/dsPart/getPartList',
-                        props:{
+                        // dicUrl:"/api/blade-desk/dsPart/list?current=1&size=100",
-                            label: 'partCode',
+                        // props:{
-                            value:'id'
+                        //     label: 'partCode',
-                        },
+                        //     value:'id',
+                        //     res:'res.records'
+                        // },
                         // onChange:val =>{
                         //     console.log('val-------------',val)
                         //     this.form.partName = val && val.item && val.item.partName
@@ -313,7 +328,7 @@ export default {
         };
     },
     mounted() {
-        this.getPartList()
+        // this.getPartList()
     },
 
     methods: {
@@ -324,15 +339,55 @@ export default {
                 partCode:val && val.item && val.item.partCode
             }).then(res =>{
                 console.log('option--------',this.option)
+                this.form.subPartCode = ''
                 this.option.column[6].dicData = res.data.data
                 // this.form.tableData[index].subList = res.data.data
             })
         },
         getPartList(){
-            getPartList().then(res =>{
+            getPartList({
-                this.partData = res.data.data
+                current:1,
+                size:50
+            }).then(res =>{
+                console.log('partData--------',res)
+                this.partData = res.data.data.records
             })
         },
+        queryPart(query){
+            this.partLoading = true
+            console.log('form----------',this.form)
+            if(query){
+               getPartList({
+                    current:1,
+                    size:50,
+                    partCode:query
+                }).then(res =>{
+                    this.partData = res.data.data.records
+                    this.partLoading = false
+                })
+            }else{
+                getPartList({
+                    current:1,
+                    size:50
+                }).then(res =>{
+                    console.log('partData--------',res)
+                    this.partData = res.data.data.records
+                    let tmp = this.partData.find(item => item.id == this.form.partId)
+                    if(!tmp){
+                        getPartList({
+                            current:1,
+                            size:50,
+                            partCode:this.form.partCode
+                        }).then(res =>{
+                            this.partData = [...this.partData,...res.data.data.records]
+                            this.partLoading = false
+                        })
+                    }else{
+                        this.partLoading = false
+                    }
+                })
+            }
+        },
         // 点击新增按钮
         handleAdd(){
             console.log('111111111111111')
@@ -436,10 +491,12 @@ export default {
         },
 
         searchReset() {
+            this.searchParams = {}
             this.query = {};
             this.onLoad(this.page);
         },
         searchChange(params, done) {
+            console.log('params-------------',params)
             this.query = params;
             this.page.currentPage = 1;
             this.onLoad(this.page, params);
@@ -453,7 +510,20 @@ export default {
             this.$refs.crud.toggleSelection();
         },
         beforeOpen(done, type) {
-            
+           if(type == 'edit'){
+            if(this.form.partCode && this.form.partCode != ''){
+                getPartList({
+                    current:1,
+                    size:10,
+                    partCode:this.form.partCode
+                }).then(res =>{
+                    this.partData = [...this.partData,...res.data.data.records]
+                    done()
+                })
+            }else{
+                done()
+            }
+           } 
         },
         currentChange(currentPage) {
             this.page.currentPage = currentPage;

src/views/warehouseManagement/workwearPlan/index.vue

@@ -481,7 +481,7 @@ export default {
   mounted() {
     // this.option.column = workColumnData[this.tabPosition]
     this.getProdIdentList()
-    this.getPart()
+    // this.getPart()
     this.getUser()
     this.getGoods()
   },