new

config/proxy.js

@@ -12,8 +12,8 @@ export default {
     "/srwms/": {
       // 要代理的地址
       // target: "http://192.168.40.18/wms/", //39:28040    18/wms/  
-      target: "http://192.168.40.203:28040", //39:28040    18/wms/    dj
-      // target: "http://192.168.40.117:28040", //39:28040    18/wms/   jf
+      // target: "http://192.168.40.203:28040", //39:28040    18/wms/    dj
+      target: "http://192.168.40.117:28040", //39:28040    18/wms/   jf
       changeOrigin: true,
       pathRewrite: {
         "^/srwms": "",

src/components/Tableform/mtable.jsx

@@ -118,7 +118,7 @@ class Mtable extends PureComponent {
                 delete newparams.pageSize;
               }
 
-              let res = await request("/wms" + path, {
+              let res = await request("/srwms" + path, {
                 body: JSON.stringify(newparams ? newparams : {}),
                 headers,
                 method: "POST",
@@ -251,7 +251,7 @@ class Mtable extends PureComponent {
             pagination == "false"
               ? data.dataList
               : data.page
-              ? data.page.list
+              ? data.page.records
               : []; //分页或不分页的接口返回数据
           return defaultval;
         }}

src/pages/Welcome.jsx

@@ -7,6 +7,7 @@ function Table({ route }) {
   const [vs, setvs] = useState();
   return (
     <div style={{ height: "200vh" }}>
+      首页
       {/* <AutoTable
         pagetitle={route.name}
         pageextra={() => <Button onClick={() => {

src/pages/platform/Reservoir/fields.js

@@ -2,7 +2,7 @@ export default {
     "customerNo": {
         "value": null,
         "type": "input",
-        "title": "编号",
+        "title": "仓位编码",
         "name": [
             "customerNo"
         ],
@@ -11,7 +11,7 @@ export default {
     "customerName": {
         "value": null,
         "type": "input",
-        "title": "名称",
+        "title": "仓位名称",
         "name": [
             "customerName"
         ],
@@ -20,7 +20,7 @@ export default {
     "officialWebsite": {
         "value": null,
         "type": "input",
-        "title": "公司官网",
+        "title": "所属仓库",
         "name": [
             "officialWebsite"
         ],
@@ -29,7 +29,7 @@ export default {
     "telephone": {
         "value": null,
         "type": "input",
-        "title": "联系电话",
+        "title": "所属库区",
         "name": [
             "telephone"
         ],
@@ -38,7 +38,7 @@ export default {
     "email": {
         "value": null,
         "type": "input",
-        "title": "公司邮箱",
+        "title": "排",
         "name": [
             "email"
         ],
@@ -47,7 +47,7 @@ export default {
     "address": {
         "value": null,
         "type": "input",
-        "title": "地址",
+        "title": "列",
         "name": [
             "address"
         ],
@@ -56,7 +56,7 @@ export default {
     "score": {
         "value": null,
         "type": "rate",
-        "title": "评分",
+        "title": "层",
         "name": [
             "score"
         ],

src/pages/platform/Sendset/index.jsx

@@ -250,7 +250,7 @@ const Pushdeploy = (props) => {
         search: false,
       },
       {
-        title: "适用类型",
+        title: "适用范围",
         dataIndex: "fitFieldName",
         key: "fitField",
         valueType: "select",
@@ -274,7 +274,7 @@ const Pushdeploy = (props) => {
         ],
       },
       {
-        title: "类型名称",
+        title: "范围名称",
         dataIndex: "fieldName",
         key: "fieldName",
       },

src/pages/platform/Specialproperties/Fieldmanage.jsx

@@ -165,13 +165,13 @@ const Fieldmanage = (props) => {
     { checkedNode } = props,
     columns = [
       {
-        title: "自定义字段名称",
+        title: "字段名称",
         dataIndex: "fieldName",
         key: "fieldName",
         search: false,
       },
       {
-        title: "自定义字段属性",
+        title: "字段类型",
         dataIndex: "fieldCharName",
         key: "fieldCharName",
         search: false,

src/services/system.js

@@ -116,7 +116,7 @@ export async function allUserSelect(params) {
 }
 //根据工厂id查询树结构
 export async function departmentTree(params) {
-  return request(`/srwms/ngic-auth/sysDepartment/query/tree`, {
+  return request(`/srwms/ngic-auth/sysDepartment/query/all/tree`, {
     method: "POST",
     data: params,
   });

src/utils/mymodelhtml.js

 import src from "../../public/ewm.png";
-import srcc from "../../public/1.png";
-// export const str = `<table
-// border="1"
-// width="100%"
-// height="100%"
-// style="border-collapse: collapse; border: solid 1px"
-// bordercolor="#000000"
-// cellpadding="0"
-// >
-// <tr>
-//   <td colspan="8">卷料名称：剪切后硅钢片</td>
-// </tr>
-// <tr>
-//   <td colspan="8">卷料编码：PDC010100093</td>
-// </tr>
-// <tr>
-//   <td colspan="4">牌号：070片</td>
-//   <td colspan="4">母卷编号：20SQC</td>
-// </tr>
-// <tr>
-//   <td colspan="4">厂家：江苏南高</td>
-//   <td colspan="4">母卷重量：100KG</td>
-// </tr>
-// <tr>
-// <td colspan="8">单边卷料厚度：200mm</td>
-// </tr>
-// <tr>
-//   <td colspan="2" rowspan="3">
-//     <img src=${src} style="width:50px"/>
-//   </td>
-//   <td colspan="3">铁损：0.68w/kg</td>
-//   <td colspan="3">批次：20230412</td>
-// </tr>
-// <tr>
-//   <td colspan="3">宽度：188mm</td>
-//   <td colspan="3">片厚：0.2mm</td>
-// </tr>
-// <tr>
-//   <td colspan="3">重量：631KG</td>
-//   <td colspan="3">米数：2292M</td>
-// </tr>
-// <tr>
-//   <td colspan="8">条码：1BR157846039401296</td>
-// </tr>
-// </table>`;
+export const str = `<table
+border="1"
+width="100%"
+height="100%"
+style="border-collapse: collapse; border: solid 1px"
+bordercolor="#000000"
+cellpadding="0"
+>
+<tr>
+  <td colspan="8">卷料名称：剪切后硅钢片</td>
+</tr>
+<tr>
+  <td colspan="8">卷料编码：PDC010100093</td>
+</tr>
+<tr>
+  <td colspan="4">牌号：070片</td>
+  <td colspan="4">母卷编号：20SQC</td>
+</tr>
+<tr>
+  <td colspan="4">厂家：江苏南高</td>
+  <td colspan="4">母卷重量：100KG</td>
+</tr>
+<tr>
+<td colspan="8">单边卷料厚度：200mm</td>
+</tr>
+<tr>
+  <td colspan="2" rowspan="3">
+    <img src=${src} style="width:50px"/>
+  </td>
+  <td colspan="3">铁损：0.68w/kg</td>
+  <td colspan="3">批次：20230412</td>
+</tr>
+<tr>
+  <td colspan="3">宽度：188mm</td>
+  <td colspan="3">片厚：0.2mm</td>
+</tr>
+<tr>
+  <td colspan="3">重量：631KG</td>
+  <td colspan="3">米数：2292M</td>
+</tr>
+<tr>
+  <td colspan="8">条码：1BR157846039401296</td>
+</tr>
+</table>`;
 
-
-export const str = `<img src=${srcc}/>`
\ No newline at end of file