修改采购

src/components/jeecg/PEditableTable.vue

@@ -2721,9 +2721,11 @@
                     disabled: isb
                   })
               })
-                this.columns[index].options = a
+                this.columns[index].options = a;
+                this.$emit("shifu",true);
+                resolve(    );
             }
-            resolve(    );
+
           });
 
           // await getAction(this.url.merchandiseNewsList,par).then( (res)=>{

src/views/activiti/form/ProcessUdgetPlanForm.vue

@@ -92,6 +92,7 @@
           :isabled="isabled"
           :rowSelection="true"
           :actionButton="true"
+          @shifu = "shifu"
           @descriptionFetch="fetchMerchandiseNews"
         >
           <!--          @selectRowChange="selectRowChange"-->
@@ -541,7 +542,8 @@
           sort: { rules: [{ required: true, message: '请输入序号!' }] }
         },
         isBu: undefined,
-        planType: ''
+        planType: '',
+        isShifu:false
       }
     },
     props: {
@@ -642,6 +644,10 @@
       selectRowChange(a, b, c) {
         // console.log("执行了",a,b,c);
       },
+      shifu(){
+        console.log("执行了");
+        this.isShifu = true;
+      },
 
       // handleChange(value, key, column) {
       //   const newData = [...this.data];
@@ -788,7 +794,7 @@
       },
        //table 值改变触发
       async onSelect   (record)  {
-        // console.log("0出发了",record.row);
+
         let isEr = true
         // if (!!record.row.materialGroup) {
         //   if (!!record.row.id && this.isBu !== record.row.materialGroup) {
@@ -820,23 +826,22 @@
         // 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 ){
+        if(this.isShifu){
+          // console.log("0出发了",record);
+          for (const res of this.bigIdMerchandiseNewsList) {
+            if(res.id === record.row.materialNumber ){
               b = true;
+            }
+          }
+          if(!b){
+            // console.log("进来了111");
+            await this.fetchMerchandiseNews(null,record.row.materialNumber );
           }
         }
-
-
-        if ( !!record.row.materialNumber && this.isBu !== record.row.materialNumber ) {
-         if(b){
-           await this.fetchMerchandiseNews();
-
-         }else{
-           await this.fetchMerchandiseNews(null,record.row.materialNumber );
-
-         }
-          // console.log("2出发了",record.row);
-
+        this.isShifu = false;
+        if(record.column.key !== 'materialPrice' && record.column.key !== 'materialQuantity'){
+          if ( !!record.row.materialNumber && this.isBu !== record.row.materialNumber ) {
+            // console.log("2出发了");
             let materialName = {}
             this.bigIdMerchandiseNewsList.forEach(item => {
               if (item.id === record.row.materialNumber) {
@@ -851,37 +856,37 @@
               }
             })
 
-          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': ''
+            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 ;
+                    ]
+                    // console.log("sadf1111")
+                    this.$refs.processUdgetPlanMaterial.setValues(values)
+                    return ;
 
-                }
-              })
+                  }
+                })
 
-            })
+              })
 
 
-            this.processUdgetPlanMaterialTable.columns[0].options.push({
+              this.processUdgetPlanMaterialTable.columns[0].options.push({
                 title: materialName.materialClassify,
                 value: materialName.descriptionId
               })
@@ -903,11 +908,14 @@
               this.isBu = record.row.materialNumber;
               isEr = false
             }
+          }
         }
 
+
+
         if (!!record.row.materialQuantity && !!record.row.materialPrice &&  isEr ) {
           // record.row.materialAmount = record.row.materialQuantity * record.row.materialPrice;
-          // console.log("3出发了",record.row);
+          // console.log("3出发了");
           //如果单价大于5万
           if (record.row.materialPrice > 50000) {
             this.materialPrice = record.row.materialPrice

src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue

@@ -351,7 +351,7 @@
             title:'仓储地点',
             align:"center",
             scopedSlots: { customRender: 'departName' },
-            dataIndex: 'departName'
+            dataIndex: 'warehouseId_dictText'
           },
           // {
           //   title:'存储仓位',