手工机台

chenxt
1 parent 403606e7
Showing 3 changed files with 61 additions and 38 deletions
src/components/Common/CommonComponent/index.js
src/components/Common/CommonTable/index.js
src/index.less
@@ -3051,9 +3051,10 @@ export default class CommonComponent extends Component {
     /*   页面输出   */
     const className = iColValue === 24 ? 'input24' : iColValue === 18 ? 'input18' : iColValue === 12 ? 'input12' : 'changeClassName';
     const mesInputBlue = enabled && !this.props.bNoMesBlue && this.firstDataIndex !== 'b';
+      const {bManual = false} = this.props?.app?.userinfo
     return (
       <div ref={this.myRef} className={`${className} ${mesInputBlue ? "mesInputBlue" : ""}`} style={componentStyle}>
-        {mesInputBlue ? <div className="mesInputBlueBg" /> : ''}
+        {mesInputBlue ? <div  className={`mesInputBlueBg  ${bManual ? 'manualOverride' : ''}`} /> : ''}
         <div className={`${this.props.className} ${readonlyStyle} ${costomStyle}`}>
           {oPreDot}
           {commonAssembly}
@@ -2395,28 +2395,28 @@ class CommonTableRc extends React.Component {
                     colorValue = t.background;
                   } else {
                     const sState = commonUtils.isEmpty(t.sState) ? 4 : t.sState;
-                     switch (Number(sState)) { // 根据状态显示颜色
-                          case 0:
-                            colorValue = '#808080'; /* 0：灰色 */
-                            break;
-                          case 1:
-                            colorValue = '#808080'; /* 1：灰色 */
-                            break;
-                          case 2:
-                            colorValue = '#ff4d4f'; /* 2：红色 */
-                            break;
-                          case 3:
-                            colorValue = '#d4b106'; /* 3：黄色 */
-                            break;
-                          case 4:
-                            colorValue = '#000000'; /* 黑色 */
-                            break;
-                          case 5:
-                            colorValue = '#49aa19'; /* 5：绿色 */
-                            break;
-                          default:
-                            colorValue = '#000000';
-                        }
+                    switch (Number(sState)) { // 根据状态显示颜色
+                      case 0:
+                        colorValue = '#808080'; /* 0：灰色 */
+                        break;
+                      case 1:
+                        colorValue = '#808080'; /* 1：灰色 */
+                        break;
+                      case 2:
+                        colorValue = '#ff4d4f'; /* 2：红色 */
+                        break;
+                      case 3:
+                        colorValue = '#d4b106'; /* 3：黄色 */
+                        break;
+                      case 4:
+                        colorValue = '#000000'; /* 黑色 */
+                        break;
+                      case 5:
+                        colorValue = '#49aa19'; /* 5：绿色 */
+                        break;
+                      default:
+                        colorValue = '#000000';
+                    }
                   }
                   return (
                     <div
@@ -12253,6 +12253,7 @@ const useGetTableBtnOprSetting = props =&gt; {
   };
   const resultTemp = {};
   const list = sDefault.split(",");
+  const bManual = props?.app?.userinfo?.bManual
   list.forEach(btnType => {
     if (btnType.includes("add")) {
       resultTemp.mesAdd = params => {
@@ -12274,20 +12275,37 @@ const useGetTableBtnOprSetting = props =&gt; {
             icon={<PlusOutlined />}
             onClick={e => {
               e.stopPropagation();
-              props.onMesTableLineAdd &&
-                props.onMesTableLineAdd({
-                  ...params,
-                  callback: props.bAddFirst
-                    ? scrollToTop(params.tableClassName)
-                    : scrollToBottom(params.tableClassName),
-                  bAddFirst: props.bAddFirst
+              if (bManual) {
+                const btnsConfig =
+                  gdsconfigformslave.find(
+                    item => item.sControlName?.toLowerCase().includes("add")
+                  ) || {};
+                props.parentProps.onExecInstructSet({
+                  btnConfig: {
+                    ...btnsConfig,
+                    sInstruct: btnsConfig.sButtonParam
+                  },
+                  nextProps: {
+                    ...props
+                  }
                 });
+              } else {
+                props.onMesTableLineAdd &&
+                  props.onMesTableLineAdd({
+                    ...params,
+                    callback: props.bAddFirst
+                      ? scrollToTop(params.tableClassName)
+                      : scrollToBottom(params.tableClassName),
+                    bAddFirst: props.bAddFirst
+                  });
+              }
+
             }}
           />
         );
       };
     } else if (btnType.includes("del")) {
-      if (btnType.includes("enventdel")) {
+      if (bManual) {
         resultTemp.mesDel = params => {
           const { record } = params;
           const { sDefault: str } = btnTableDelConfig;
@@ -12312,10 +12330,10 @@ const useGetTableBtnOprSetting = props =&gt; {
                     item => item.sControlName?.toLowerCase().includes("btnenventdel")
                   ) || {};
                 props.parentProps.onExecInstructSet({
-                 btnConfig: {
-                  ...btnsConfig,
-                  sInstruct: btnsConfig.sButtonParam 
-                },
+                  btnConfig: {
+                    ...btnsConfig,
+                    sInstruct: btnsConfig.sButtonParam
+                  },
                   nextProps: {
                     ...props
                   }
@@ -12371,7 +12389,7 @@ const useGetTableBtnOprSetting = props =&gt; {
       }
         ;
     } else if (btnType.includes("save")) {
-      if (btnType.includes("enventsave")) {
+      if (bManual) {
         resultTemp.mesSave = () => (
           <Button
             className={styles.mesSave}
@@ -12382,11 +12400,11 @@ const useGetTableBtnOprSetting = props =&gt; {
                 gdsconfigformslave.find(
                   item => item.sControlName?.toLowerCase().includes("btnenventsave")
                 ) || {};
-         
+
               props.parentProps.onExecInstructSet({
                 btnConfig: {
                   ...btnsConfig,
-                  sInstruct: btnsConfig.sButtonParam 
+                  sInstruct: btnsConfig.sButtonParam
                 },
                 nextProps: {
                   ...props
@@ -4685,3 +4685,7 @@ ton:focus {
     height: 32px !important;
   }
 }
+:global .manualOverride {
+  width: 100% !important;
+  left: 0 !important;
+}
 \ No newline at end of file