修改名称可以搜索

src/components/jeecg/PEditableTable.vue

@@ -536,7 +536,8 @@
                           :placeholder="replaceProps(col, col.placeholder)"
                           @change="(v)=>handleSearchSelectChange(v,id,row,col)"
                           allowClear
-                          @focus="a"
+                          :filterOption="false"
+
                         />
                         <!--                          :filterOption="filterOption"-->
                         <span
@@ -2149,6 +2150,20 @@
         }
         // 存储输入的值
         this.inputValues[index][column.key] = value
+        // console.log("sadfgasdf",value);
+        // //查询信息
+        // let pam ={
+        //   descriptionNam: value,
+        //
+        // }
+        // getAction(this.url.descriptionRakeUrl,pam).then(res=>{
+        //   if(){
+        //
+        //   }
+        // })
+
+
+
         // 做单个表单验证
         this.validateOneInput(value, row, column, this.notPassedIds, true, 'input')
 
@@ -2667,7 +2682,7 @@
         return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       },
       searchOption (input,pro,index){
-        console.log("searchOption=========",input,pro);
+        // console.log("searchOption=========",input,pro,index);
         return new Promise(async (resolve, reject) => {
           let par = {
 
@@ -2677,19 +2692,57 @@
             // getAction(this.url.descriptionRake,par).then((res)=>{
             let a= [];
             if(res.success){
-              console.log("222222222222222===",res.result.records);
-              res.result.records.forEach( item => {
-                a.push({
-                  title : item.materialClassify,
-                  value :  item.id,
+              // console.log("222222222222222===",res.result);
+              let pam = res.result.records||res.result;
+
+
+                pam.forEach( item => {
+                  let isb = false;
+
+                    // this.getValues((a, b, c) => {
+                    //   console.log("bbbbbbbbbbbbbb",b.materialNumber)
+                    //   if(!!b.materialNumber){
+                    //     console.log("bbbbbbbbbbbbbb",b)
+                    //     b.forEach(item => {
+                    //       if (item.materialNumber  === item.id) {
+                    //         isb = true;
+                    //       }
+                    //     })
+                    //   }
+                    //
+                    //
+                    // })
+
+
+                  a.push({
+                    title : item.materialsNumber,
+                    value :  item.id,
+                    disabled: isb
+                  })
                 })
-              })
+                this.columns[index].options = a
             }
-
-            this.columns[index].options = a
             resolve(    );
           });
 
+          // await getAction(this.url.merchandiseNewsList,par).then( (res)=>{
+          //   // getAction(this.url.descriptionRake,par).then((res)=>{
+          //   let a= [];
+          //   if(res.success){
+          //     let pam = res.result.records||res.result;
+          //     console.log("222222222222222===",pam);
+          //     pam.forEach( item => {
+          //       a.push({
+          //         title : item.materialClassify,
+          //         value :  item.id,
+          //       })
+          //     })
+          //   }
+          //   // this.columns[index].options = a
+          //   // console.log( this.columns[index].options)
+          //   resolve(  this.columns[index].options = a   );
+          // });
+
         })
 
       },

src/views/activiti/form/ProcessUdgetPlanForm.vue

@@ -810,10 +810,24 @@
         // }
         // console.log("5555出发了",record.row);
         // if ( !!record.row.materialNumber && isEr) {
+        let b = false;
+        for (const res of this.bigIdMerchandiseNewsList) {
+          if(res.id === record.row.materialNumber ){
+              b = true;
+          }
+        }
+
 
         if ( !!record.row.materialNumber && this.isBu !== record.row.materialNumber ) {
-          await this.fetchMerchandiseNews();
+         if(b){
+           await this.fetchMerchandiseNews();
+
+         }else{
+           await this.fetchMerchandiseNews(null,record.row.materialNumber );
+
+         }
           // console.log("2出发了",record.row);
+
             let materialName = {}
             this.bigIdMerchandiseNewsList.forEach(item => {
               if (item.id === record.row.materialNumber) {
@@ -827,8 +841,38 @@
 
               }
             })
-            if (!!record.row.id) {
-              this.processUdgetPlanMaterialTable.columns[0].options.push({
+
+          if (!!record.row.id) {
+            await this.$refs.processUdgetPlanMaterial.getValues((a, b, c) => {
+              // console.log("bbbbbbbbbbbbbb",b)
+              b.forEach(item => {
+                if (item.materialNumber === record.row.materialNumber && !!item.materialGroup && !record.row.materialGroup) {
+                  let values = [
+                    {
+                      rowKey: record.row.id,
+                      values: {
+                        'materialGroup': '',
+                        'materialNumber': '',
+                        'materialSeries': '',
+                        'materialName': '',
+                        'materialUnit': '',
+                        'supplierId': '',
+                        'materialAmount': '',
+                        'materialType': ''
+                      }
+                    }
+                  ]
+                  // console.log("sadf1111")
+                  this.$refs.processUdgetPlanMaterial.setValues(values)
+                  return ;
+
+                }
+              })
+
+            })
+
+
+            this.processUdgetPlanMaterialTable.columns[0].options.push({
                 title: materialName.materialClassify,
                 value: materialName.descriptionId
               })
@@ -882,12 +926,13 @@
         }
 
       },
-      fetchMerchandiseNews(value) { //查询物料清单信息
+      fetchMerchandiseNews(value,id) { //查询物料清单信息
         return new Promise((resolve, reject)=>{
           //查询大品类数据
           let par = {
             delFlag: 0,
-            descriptionId: value
+            descriptionId: value,
+            id:id
           }
           this.bigIdMerchandiseNews = []
           this.bigIdMerchandiseNewsList = []
@@ -906,10 +951,12 @@
           })
           getAction(this.url.merchandiseNewsList, par).then((res) => {
             // console.log('12312', res.result)
+            // console.log('12312')
 
             if (res.success) {
               let newList = res.result
               if (numberList.length > 0) {
+                // console.log("大雨")
                 newList.forEach(item => {
                   qc.push({
                     title: item.materialsNumber,
@@ -919,13 +966,15 @@
                 })
                 numberList.forEach(num => {
                   qc.forEach(i => {
-                    if (num === i.value) {
+                    // console.log("111111111111111",i.value)
+                    if (num === i.value && !!num) {
                       i.disabled = true
                     }
                   })
                 })
                 this.processUdgetPlanMaterialTable.columns[1].options = qc
               } else {
+                // console.log("小雨")
                 newList.forEach(item => {
                   this.processUdgetPlanMaterialTable.columns[1].options.push({
                     title: item.materialsNumber,
@@ -935,8 +984,9 @@
                 })
               }
               this.bigIdMerchandiseNewsList = res.result;
-              resolve( res.result );
+              // resolve( this.bigIdMerchandiseNewsList );
             }
+            resolve( this.bigIdMerchandiseNewsList );
           })
         });