Xiaopeng Zhang пре 5 месеци
родитељ
комит
4fdc713833
5 измењених фајлова са 111 додато и 5 уклоњено
  1. 4 0
      src/App2.js
  2. 22 0
      src/Djcs3.js
  3. 20 1
      src/Qingdan3.js
  4. 3 0
      src/Rcjhz.js
  5. 62 4
      src/Service.js

+ 4 - 0
src/App2.js

@@ -774,6 +774,10 @@ import Tooltip from '@mui/material/Tooltip';
 
           Service.setQufei(x);
           });
+          Service.generateJiagongcai(location["id"]).then(x=>{
+
+            Service.setJiagongcai(x);
+            });
         Service.generateOutline2(location["id"]).then(x=>{
           let y = x.map(z=>{
             z['key'] = z['id'];

+ 22 - 0
src/Djcs3.js

@@ -59,6 +59,28 @@ export default function Djcs3({name, bh, rgde, jxde, clde, beizhu, beizhuFK, cli
       }
 
 
+      var editCheckJg = function(cell){
+          //cell - the cell component for the editable cell
+      
+          //get row data
+          //console.log(cell);
+          if(isQdrcj.current) return false;
+          if (cell._cell.row.getData()['人材机编码'] == '00EXP001') {//回程费
+               return false;
+          }
+          if (cell._cell.row.getData()['人材机编码'] == '99EXP007') {//
+               return false;
+          }
+          if (cell._cell.row.getData()['人材机编码'] == '31130104') {//
+               return false;
+          }
+          if (cell._cell.row.getData()['甲供标志'] == 'true') {//
+               return false;
+          }
+          return true;
+      }
+
+
 
       var sparklineFormatter = function(cell, formatterParams, onRendered){
           for (let i = 0; i < highlight.current.length; i++) {

+ 20 - 1
src/Qingdan3.js

@@ -246,6 +246,24 @@ export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台
           return true;
       }
 
+      var editCheckJg = function(cell){
+          //cell - the cell component for the editable cell
+      
+          //get row data
+          //console.log(cell);
+          if(isQdrcj.current) return false;
+          if (cell._cell.row.getData()['人材机编码'] == '410000F') {
+               return false;
+          }
+          if (cell._cell.row.getData()['人材机编码'].includes('000FE')) {
+               return false;
+          }
+          if (cell._cell.row.getData()['甲供标志'] == 'true') {
+               return false;
+          }
+
+          return true;
+      }
       var editCheckRcj = function(cell){
           //cell - the cell component for the editable cell
       
@@ -258,6 +276,7 @@ export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台
           if (cell._cell.row.getData()['人材机编码'].includes('000FE')) {
                return false;
           }
+          
 
           return true;
       }
@@ -1148,7 +1167,7 @@ export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台
                                          {title:"名称", field:"名称", width:120,headerSort:false,  formatter:"textarea", editor: "input", editable: editCheckRcj },
                                          {title:"规格型号", field:"规格型号", width:80, headerSort:false, editor: "input", editable: editCheckRcj },
                                          {title:"单位", field:"单位", width:80, headerSort:false, formatter:"textarea"}, //hide this column first
-                                         {title:"单价", field:"单价", width:80 , headerSort:false, formatter: sparklineFormatter, editor: "input", editable: editCheckRcj },
+                                         {title:"单价", field:"单价", width:80 , headerSort:false, formatter: sparklineFormatter, editor: "input", editable: editCheckJg },
                                          {title:"产地", field:"产地", width:80, headerSort:false, },
                                          {title:"供应厂商", field:"供应厂商", width:80, headerSort:false, },
                                          {title:"人材机类别", field:"人材机类别", width:80, headerSort:false, },

+ 3 - 0
src/Rcjhz.js

@@ -31,6 +31,9 @@ export default function Rcjhz({id, bh, tiaojiaCallback, updatetime}) {
     if (cell._cell.row.getData()['编码'].includes('31130104')) {//回程费用
       return false;
    }
+   if (cell._cell.row.getData()['甲供标志'] == ('true')) {//回程费用
+    return false;
+ }
 
     return true;
   }

+ 62 - 4
src/Service.js

@@ -12,6 +12,7 @@ class Service{
         this.mem_pointer_djcs = -1;
         this.qufei = [];
         this.qufeiEntry = null;
+        this.jiagongcai = [];
         
     }
     
@@ -42,6 +43,10 @@ class Service{
         }
         this.qufei = result;
     }
+    setJiagongcai(data) {
+        
+        this.jiagongcai = data;
+    }
 
     setQufeiEntry(bh) {
         this.qufeiEntry = this.qufei.filter(x=>x['key'] == bh)[0];
@@ -720,6 +725,27 @@ async generateQingdanTuijian(name, bh, bt, bm) {
             return data;
         }
     }
+    async generateJiagongcai(name) {
+        const response = await fetch(this.ip().concat( "/jiagongcai/"), {
+            method : "POST",
+            headers: {
+                "Content-type": "application/json"
+            },
+            body: JSON.stringify(
+                {
+                    
+                    "name": name 
+                }
+            )
+        });
+        if (!response.ok) {
+            //const error = await response.json();
+            console.error('error');
+        } else {
+            const data = await response.json();
+            return data;
+        }
+    }
 
     async save_djcs() {
         const response = await fetch(this.ip().concat( "/savedjcs/"), {
@@ -1967,9 +1993,25 @@ async generateQingdanTuijian(name, bh, bt, bm) {
                     '', '', '', '' ]);
                 }
                 for(let i = 0; i < res['clde'].length; i++) {
-                    dercj.push(['', res['clde'][i]['CLBH'], res['clde'][i]['CLMC'], '', res['clde'][i]['JLDW'], 
-                    res['clde'][i]['YSJG'], '', '', '2', '', res['clde'][i]['SL'], res['clde'][i]['HJ'],
+                    let hit = false;
+                    let jg = null;
+                    let bh = res['clde'][i]['CLBH'];
+                    for(let j = 0; j < this.jiagongcai.length; j++) {
+                        if (this.jiagongcai[j]['材料编号'] == bh) {
+                            hit = true;
+                            jg = this.jiagongcai[j]['单价'];
+                        }
+                    }
+                    if (hit) {
+                        dercj.push(['', res['clde'][i]['CLBH'], res['clde'][i]['CLMC'], '', res['clde'][i]['JLDW'], 
+                    jg, '', '', '2', 'true', res['clde'][i]['SL'], res['clde'][i]['HJ'],
+                    '', '', '', '' ]);
+                    } else {
+                        dercj.push(['', res['clde'][i]['CLBH'], res['clde'][i]['CLMC'], '', res['clde'][i]['JLDW'], 
+                    res['clde'][i]['YSJG'], '', '', '2', 'false', res['clde'][i]['SL'], res['clde'][i]['HJ'],
                     '', '', '', '' ]);
+                    }
+                    
                 }
                 for(let i = 0; i < res['jxde'].length; i++) {
                     dercj.push(['', res['jxde'][i]['jxbh'], res['jxde'][i]['jxmc'], '', res['jxde'][i]['DW'], 
@@ -2044,9 +2086,25 @@ async generateQingdanTuijian(name, bh, bt, bm) {
                     '', '', '', '' ]);
                 }
                 for(let i = 0; i < res['clde'].length; i++) {
-                    dercj.push(['', res['clde'][i]['CLBH'], res['clde'][i]['CLMC'], '', res['clde'][i]['JLDW'], 
-                    res['clde'][i]['YSJG'], '', '', '2', '', res['clde'][i]['SL'], res['clde'][i]['HJ'],
+                    let hit = false;
+                    let jg = null;
+                    let bh = res['clde'][i]['CLBH'];
+                    for(let j = 0; j < this.jiagongcai.length; j++) {
+                        if (this.jiagongcai[j]['材料编号'] == bh) {
+                            hit = true;
+                            jg = this.jiagongcai[j]['单价'];
+                        }
+                    }
+                    if (hit) {
+                        dercj.push(['', res['clde'][i]['CLBH'], res['clde'][i]['CLMC'], '', res['clde'][i]['JLDW'], 
+                    jg, '', '', '2', 'true', res['clde'][i]['SL'], res['clde'][i]['HJ'],
                     '', '', '', '' ]);
+                    } else {
+                        dercj.push(['', res['clde'][i]['CLBH'], res['clde'][i]['CLMC'], '', res['clde'][i]['JLDW'], 
+                    res['clde'][i]['YSJG'], '', '', '2', 'false', res['clde'][i]['SL'], res['clde'][i]['HJ'],
+                    '', '', '', '' ]);
+                    }
+                    
                 }
                 for(let i = 0; i < res['jxde'].length; i++) {
                     dercj.push(['', res['jxde'][i]['jxbh'], res['jxde'][i]['jxmc'], '', res['jxde'][i]['DW'],