增加梦天的数据

src/option/factory/mt/factoryOrderMain.js

@@ -46,6 +46,7 @@ export default {
     {
       label: "仓库类型",
       prop: "warehouseType",
+      search:true,
       type: "input",
     },
     {
@@ -141,10 +142,34 @@ export default {
       viewDisplay: false,
       hide: true,
     },
+
+
     {
       label: "推送状态",
       prop: "pushStatusName",
+      search: true,
+      type: 'select',
+      dicData: [
+       
+        {
+          label: '已推送',
+          value: 1,
+        },
+        {
+          label: '未推送',
+          value: 2,
+        }
+    
+      ],
+    },
+    {
+      label: "推送时间",
+      prop: "pushTime",
       type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: false,
     },
   ]
 }

src/option/factory/mt/packageInfo.js

@@ -32,6 +32,7 @@ export default {
     {
       label: "订单自编码",
       prop: "orderCode",
+      search: true,
       type: "input",
     },
     {
@@ -52,6 +53,8 @@ export default {
     {
       label: "包装编号",
       prop: "packageCode",
+      search: true,
+
       type: "input",
     },
     {
@@ -88,8 +91,31 @@ export default {
     {
       label: "推送状态",
       prop: "pushStatusName",
+      search: true,
+      type: 'select',
+      dicData: [
+       
+        {
+          label: '已推送',
+          value: 1,
+        },
+        {
+          label: '未推送',
+          value: 2,
+        }
+    
+      ],
+    },
+    {
+      label: "推送时间",
+      prop: "pushTime",
       type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay:true,
+      hide: false,
     },
+ 
     {
       label: "创建人",
       prop: "createUser",

src/page/login/index.vue

@@ -6,32 +6,15 @@
           {{ time }}
         </div>
         <p class="title">{{ $t('login.info') }}</p>
-        <!-- <div style="font-size: 15px">
-          <span>----------------------------------------------</span>
-          <br />
-          <span>管理租户编号：000000</span>
-          <br />
-          <span>超级管理员账号: admin / admin</span>
-          <br />
-          <span>人事账号: hr / hr</span>
-          <br />
-          <span>经理账号: manager / manager</span>
-          <br />
-          <span>老板账号: boss / boss</span>
-          <br />
-          <span>----------------------------------------------</span>
-          <br />
-          <span>普通租户编号：详见租户管理模块</span>
-          <br />
-          <span>租户管理员账号: admin / admin</span>
-          <br />
-          <span>----------------------------------------------</span>
-        </div> -->
-        <!--<img class="img" src="/img/logo.png" alt="">-->
+   
+        <!-- <img class="img" src="/img/logo.png" alt=""> -->
       </div>
       <div class="login-border">
+      
+
         <div class="login-main">
           <h4 class="login-title">
+            
             {{ $t('login.title') }}{{ website.title }}
             <top-lang></top-lang>
           </h4>

src/views/factory/mt/factoryOrderMain.vue

@@ -321,10 +321,13 @@ export default {
     onLoad(page, params = {}) {
       this.loading = true;
 
-      const {invoiceOrderCode} = this.query;
+      const {invoiceOrderCode,pushStatusName,warehouseType} = this.query;
+
 
       let values = {
-        invoiceOrderCode:invoiceOrderCode
+        invoiceOrderCode:invoiceOrderCode,
+        pushStatus:pushStatusName,
+        warehouseType:warehouseType
       };
 
       getList(page.currentPage, page.pageSize, values).then(res => {

src/views/factory/mt/packageInfo.vue

@@ -30,9 +30,9 @@
           @click="handleDelete"
           >删 除
         </el-button> -->
-        <el-button type="warning" plain icon="el-icon-download" @click="handleExport"
+        <!-- <el-button type="warning" plain icon="el-icon-download" @click="handleExport"
           >导 出
-        </el-button>
+        </el-button> -->
 
         <el-button type="warning"  @click="handlePush">推送 </el-button>
       </template>
@@ -360,10 +360,13 @@ export default {
     onLoad(page, params = {}) {
       this.loading = true;
 
-      const { invoiceOrderCode } = this.query;
-
+      const { invoiceOrderCode,pushStatusName,orderCode,packageCode } = this.query;
+      
       let values = {
         invoiceOrderCode: invoiceOrderCode,
+        pushStatus:pushStatusName,
+        orderCode:orderCode,
+        packageCode:packageCode,
       };
 
       getList(page.currentPage, page.pageSize, values).then(res => {

vite.config.js

@@ -15,7 +15,7 @@ export default ({ mode, command }) => {
           // target: 'http://192.168.10.126:8889',
           // target: 'http://192.168.10.48:8888',
           // target: 'http://192.168.10.123:8889',
-          target: 'http://192.168.10.75:8777',
+          target: 'http://192.168.10.101:8888',
           // target: 'http://192.168.10.101:8888',
           // target: 'http://192.168.10.29:13000',  
           // target: 'http://test.api.huitongys.com',