From 0771397f1976befce63dd7dd4331e3f51cf876ce Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Wed, 15 Mar 2023 16:13:36 +0800
Subject: [PATCH] update

---
 public/index.html                       |  4 ++--
 src/views/modules/pms/car/config.js     | 24 ++++++++++++------------
 src/views/modules/pms/product/config.js | 20 ++++++++++----------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/public/index.html b/public/index.html
index c743726..2bac74f 100644
--- a/public/index.html
+++ b/public/index.html
@@ -39,8 +39,8 @@
     <script>
     // window.SITE_CONFIG['apiURL'] = 'http://192.168.1.103:8080/pms-am';
     // window.SITE_CONFIG['apiURL'] = 'http://192.168.1.49:8080/pms-am'; // tengyun
-    // window.SITE_CONFIG['apiURL'] = 'http://192.168.1.62:8080/pms-am'; // tao
-    window.SITE_CONFIG['apiURL'] = 'http://192.168.1.21:8080/pms-am'; // xv
+    window.SITE_CONFIG['apiURL'] = 'http://192.168.1.62:8080/pms-am'; // tao
+    // window.SITE_CONFIG['apiURL'] = 'http://192.168.1.21:8080/pms-am'; // xv
     </script>
   <% } %>
   <!-- 集成测试环境 -->
diff --git a/src/views/modules/pms/car/config.js b/src/views/modules/pms/car/config.js
index 94226b1..0734938 100644
--- a/src/views/modules/pms/car/config.js
+++ b/src/views/modules/pms/car/config.js
@@ -8,10 +8,10 @@ export default function () {
   const tableProps = [
     { type: 'index', label: '序号' },
     { prop: "createTime", label: "添加时间", filter: timeFilter },
-    { prop: "name", label: "窑车号" },
-    { prop: "code", label: "编码" },
+    { prop: "code", label: "窑车号" },
+    // { prop: "code", label: "编码" },
     // { prop: "typeDictValue", label: "过渡车", filter: val => ['否', '是'][val] },
-    { prop: "enabled", label: "状态", subcomponent: switchBtn }, // subcomponent
+    // { prop: "enabled", label: "状态", subcomponent: switchBtn }, // subcomponent
     // { prop: "currentQty", label: "载量" },
     // { prop: "currentPos", label: "当前位置" },
     // { prop: "description", label: "描述" },
@@ -28,7 +28,7 @@ export default function () {
 
   const headFormFields = [
     {
-      prop: 'name',
+      prop: 'code',
       label: "窑车号",
       input: true,
       default: { value: "" },
@@ -68,17 +68,17 @@ export default function () {
           {
             input: true,
             label: "窑车号",
-            prop: "name",
+            prop: "code",
             rules: { required: true, message: "必填项不能为空", trigger: "blur" },
             elparams: { placeholder: "请输入窑车号" },
           },
-          {
-            input: true,
-            label: "编码",
-            prop: "code",
-            rules: { required: true, message: "必填项不能为空", trigger: "blur" },
-            elparams: { placeholder: "请输入料仓编码" },
-          },
+          // {
+          //   input: true,
+          //   label: "编码",
+          //   prop: "code",
+          //   rules: { required: true, message: "必填项不能为空", trigger: "blur" },
+          //   elparams: { placeholder: "请输入料仓编码" },
+          // },
         ],
         // [{ component: QuillRichInput, label: "描述信息", prop: "description" }],
         [{
diff --git a/src/views/modules/pms/product/config.js b/src/views/modules/pms/product/config.js
index 42317c8..5672d32 100644
--- a/src/views/modules/pms/product/config.js
+++ b/src/views/modules/pms/product/config.js
@@ -7,9 +7,9 @@ export default function () {
   const tableProps = [
     { type: "index", label: "序号" },
     { prop: "createTime", label: "添加时间", filter: timeFilter },
-    { prop: "name", label: "产品名称" },
-    { prop: "code", label: "产品编码" },
-    { prop: "typeDictValue", label: "产品类型", filter: dictFilter("product_type") },
+    { prop: "name", label: "物料名称" },
+    { prop: "code", label: "物料编码" },
+    { prop: "typeDictValue", label: "物料类型", filter: dictFilter("product_type") },
     { prop: "specifications", label: "规格" },
     { prop: "unitDictValue", label: "单位", filter: dictFilter("unit") },
     { prop: "weight", label: "重量", filter: (val) => (val ? val + " kg" : "-") },
@@ -32,7 +32,7 @@ export default function () {
       prop: "key",
       input: true,
       default: { value: "" },
-      bind: { placeholder: "请输入产品名称或编码" },
+      bind: { placeholder: "请输入物料名称或编码" },
     },
     {
       button: {
@@ -52,8 +52,8 @@ export default function () {
   const dictList = JSON.parse(localStorage.getItem("dictList") || {});
   const dialogConfigs = {
     menu: [
-      { name: "产品信息", key: "info" },
-      { name: "产品属性信息", key: "attr", onlyEditMode: true },
+      { name: "物料信息", key: "info" },
+      { name: "物料属性信息", key: "attr", onlyEditMode: true },
       {
         name: "附件",
         key: "attachment",
@@ -66,14 +66,14 @@ export default function () {
         [
           {
             input: true,
-            label: "产品名称/砖型名称",
+            label: "物料名称/砖型名称",
             prop: "name",
             rules: { required: true, message: "必填项不能为空", trigger: "blur" },
             elparams: { placeholder: "请输入设备名称" },
           },
           {
             input: true,
-            label: "产品编码/砖型编码",
+            label: "物料编码/砖型编码",
             prop: "code",
             rules: { required: true, message: "必填项不能为空", trigger: "blur" },
             elparams: { placeholder: "请输入设备编码" },
@@ -81,10 +81,10 @@ export default function () {
           // { input: true, label: '版本号', prop: 'version', elparams: { placeholder: '请输入版本号' } },
           {
             select: true,
-            label: "产品类型",
+            label: "物料类型",
             prop: "typeDictValue",
             options: "product_type" in dictList ? dictList["product_type"].map((item) => ({ value: item.dictValue, label: item.dictLabel })) : [],
-            elparams: { placeholder: "选择一个产品类型" },
+            elparams: { placeholder: "选择一个物料类型" },
           },
         ],
         [