From 036cdd90d36332ab6b4d6b0be4aa5c54e7f170f8 Mon Sep 17 00:00:00 2001
From: "Mr.sun" <2290907227@qq.com>
Date: Wed, 17 Apr 2024 15:37:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=B7=AE=E5=BC=82=E5=B1=8F?=
 =?UTF-8?q?=E8=94=BD=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.project                                  |   2 +-
 .../inventory/InventoryDifference.vue         | 155 +++++++++---------
 .../libraryManage/lockOutStore/index.vue      |   8 +-
 src/views/taskManagement/index.vue            | 151 +++--------------
 vue.config.js                                 |   2 +-
 5 files changed, 104 insertions(+), 214 deletions(-)

diff --git a/.env.project b/.env.project
index 2bc7981..65b1b84 100644
--- a/.env.project
+++ b/.env.project
@@ -5,4 +5,4 @@ VUE_APP_TITLE = 管理系统
 ENV = 'production'
 
 # 管理系统/生产环境
-VUE_APP_BASE_API = 'http://192.168.1.199:8040'
+VUE_APP_BASE_API = 'http://192.168.7.4:8030'
diff --git a/src/views/libraryManage/inventory/InventoryDifference.vue b/src/views/libraryManage/inventory/InventoryDifference.vue
index 741e5ce..df11eb4 100644
--- a/src/views/libraryManage/inventory/InventoryDifference.vue
+++ b/src/views/libraryManage/inventory/InventoryDifference.vue
@@ -2,7 +2,10 @@
   <!-- 盘点差异处理 -->
   <div class="app-container">
     <div class="search-box">
-      <el-form :inline="true" :model="enterForm">
+      <el-form
+        :inline="true"
+        :model="enterForm"
+      >
         <el-form-item label="单据编号">
           <el-input
             v-model="enterForm.invOrderNo"
@@ -11,7 +14,10 @@
           ></el-input>
         </el-form-item>
 
-        <el-form-item label="操作员" prop="userName">
+        <el-form-item
+          label="操作员"
+          prop="userName"
+        >
           <el-select
             v-model="enterForm.userName"
             filterable
@@ -28,7 +34,10 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="queryTable">搜索</el-button>
+          <el-button
+            type="primary"
+            @click="queryTable"
+          >搜索</el-button>
           <el-button @click="resetQuery">重置</el-button>
         </el-form-item>
       </el-form>
@@ -36,7 +45,7 @@
     <div class="opt-box">
       <div class="opt-box-right">
         <el-row :gutter="10">
-          <el-col :span="1.5">
+          <!-- <el-col :span="1.5">
             <el-button
               type="primary"
               @click="calce"
@@ -51,14 +60,13 @@
               :disabled="!handleSelect.length != 0"
               >取消盘点</el-button
             >
-          </el-col>
+          </el-col> -->
           <el-col :span="1.5">
             <el-button
               type="primary"
               @click="quren"
               :disabled="!handleSelect.length != 0"
-              >盘点确认</el-button
-            >
+            >盘点确认</el-button>
           </el-col>
         </el-row>
       </div>
@@ -80,28 +88,23 @@
   </div>
 </template>
 <script>
-import { mapGetters } from "vuex";
-import { tableConfig } from "./config.js";
-import { Debounce, getDictLabel } from "@/utils/index";
-import { listUser } from "@/api/libraryManage/common";
-import {
-  differenceList,
-  generatorCheckInv,
-  confirm,
-  cancel,
-} from "@/api/libraryManage/inventory";
+import { mapGetters } from 'vuex'
+import { tableConfig } from './config.js'
+import { Debounce, getDictLabel } from '@/utils/index'
+import { listUser } from '@/api/libraryManage/common'
+import { differenceList, generatorCheckInv, confirm, cancel } from '@/api/libraryManage/inventory'
 export default {
-  name: "Inventory",
-  dicts: ["goods_unit", "inv_type_dict"],
+  name: 'Inventory',
+  dicts: ['goods_unit', 'inv_type_dict'],
   computed: {
-    ...mapGetters(["user"]),
+    ...mapGetters(['user'])
   },
   data() {
     return {
       options2: [], // 当前用户
       enterForm: {
-        invOrderNo: "",
-        userName: "",
+        invOrderNo: '',
+        userName: ''
       },
       tableData: [],
       handleSelect: [],
@@ -110,125 +113,121 @@ export default {
       paging: {
         page: 1, // 当前页
         size: 10, // 页面大小
-        total: 0,
-      },
-    };
+        total: 0
+      }
+    }
   },
   mounted() {},
   async created() {
-    this.tableConfig = await this.getTableHeaderCom(
-      "busin_inventory_different",
-      tableConfig.call(this),
-      "configInventoryDifference"
-    );
-    await this.getList();
-    this.queryTable();
+    this.tableConfig = await this.getTableHeaderCom('busin_inventory_different', tableConfig.call(this), 'configInventoryDifference')
+    await this.getList()
+    this.queryTable()
   },
   methods: {
     /** 查询用户列表 */
     async getList() {
       listUser({}).then((response) => {
-        this.options2 = response.data;
-        this.enterForm.userName = this.user.userName;
-      });
+        this.options2 = response.data
+        this.enterForm.userName = this.user.userName
+      })
     },
     // 表格复选框选中
     handleselection(val) {
-      this.handleSelect = val.map((ele) => ele.id);
+      this.handleSelect = val.map((ele) => ele.id)
     },
     // 重置
     resetQuery() {
-      this.enterForm = {};
+      this.enterForm = {}
     },
     // 表格的数据
     queryTable() {
-      this.loading = true;
+      this.loading = true
       differenceList({
         pageSize: this.paging.size,
         pageNum: this.paging.page,
-        ...this.enterForm,
+        ...this.enterForm
       })
         .then((response) => {
           if (response.code === 200) {
-            this.loading = false;
-            this.paging.total = response.total;
-            this.tableData = response.rows;
+            this.loading = false
+            this.paging.total = response.total
+            this.tableData = response.rows
           }
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     // 确认
     quren() {
       let obj = {
         userName: this.enterForm.userName,
-        ids: this.handleSelect,
-      };
+        ids: this.handleSelect
+      }
       confirm(obj)
         .then((response) => {
           if (response.code === 200) {
-            this.loading = false;
+            this.loading = false
             this.$message({
-              message: "操作成功!",
-              type: "success",
-            });
-            this.queryTable();
+              message: '操作成功!',
+              type: 'success'
+            })
+            this.queryTable()
           }
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     // 生成复盘
     calce() {
       let obj = {
         userName: this.enterForm.userName,
-        ids: this.handleSelect,
-      };
+        ids: this.handleSelect
+      }
       generatorCheckInv(obj)
         .then((response) => {
           if (response.code === 200) {
-            this.loading = false;
+            this.loading = false
             this.$message({
-              message: "操作成功!",
-              type: "success",
-            });
-            this.queryTable();
+              message: '操作成功!',
+              type: 'success'
+            })
+            this.queryTable()
           }
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     // 取消盘点
     generateThePlan() {
-      this.$confirm("是否确认删除所选明细?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      this.$confirm('是否确认删除所选明细?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       }).then(async () => {
-        this.remove();
-      });
+        this.remove()
+      })
     },
     // 取消盘点请求
     remove() {
       cancel(this.handleSelect)
         .then((response) => {
           if (response.code === 200) {
-            this.loading = false;
+            this.loading = false
             this.$message({
-              message: "操作成功!",
-              type: "success",
-            });
-            this.queryTable();
+              message: '操作成功!',
+              type: 'success'
+            })
+            this.queryTable()
           }
         })
         .catch(() => {
-          this.loading = false;
-        });
-    },
-  },
-};
+          this.loading = false
+        })
+    }
+  }
+}
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped></style>
diff --git a/src/views/libraryManage/lockOutStore/index.vue b/src/views/libraryManage/lockOutStore/index.vue
index ed624e9..a504220 100644
--- a/src/views/libraryManage/lockOutStore/index.vue
+++ b/src/views/libraryManage/lockOutStore/index.vue
@@ -20,7 +20,7 @@
         />
       </el-form-item>
 
-      <el-form-item
+      <!-- <el-form-item
         label="批次号"
         prop="batch"
       >
@@ -38,7 +38,7 @@
           >
           </el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
 
       <el-button
         type="primary"
@@ -103,7 +103,7 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item
+        <!-- <el-form-item
           label="批次号"
           prop="batch"
         >
@@ -123,7 +123,7 @@
             </el-option>
           </el-select>
 
-        </el-form-item>
+        </el-form-item> -->
         <!-- <el-form-item
           label="叫料位置"
           prop="trolleyType"
diff --git a/src/views/taskManagement/index.vue b/src/views/taskManagement/index.vue
index 23bcd63..8d519e8 100644
--- a/src/views/taskManagement/index.vue
+++ b/src/views/taskManagement/index.vue
@@ -286,7 +286,8 @@ export default {
         size: 50, // 页面大小
         total: 0
       },
-      value1: [moment().locale('zh-cn').format('yyyy-MM-DD 00:00:00'), moment().locale('zh-cn').add(1, 'days').format('yyyy-MM-DD 00:00:00')],
+      // value1: [moment().locale('zh-cn').format('yyyy-MM-DD 00:00:00'), moment().locale('zh-cn').add(1, 'days').format('yyyy-MM-DD 00:00:00')],
+      value1: [],
       //存放设备数组
       devNameArr: [],
 
@@ -298,14 +299,6 @@ export default {
           istrue: true,
           isActive: ''
         },
-
-        // {
-        //   label: '开关',
-        //   prop: 'isActivity',
-        //   type: 'slot',
-        //   istrue: true,
-        //   name: 'switchChange'
-        // },
         {
           label: '任务单号',
           prop: 'taskCode',
@@ -318,25 +311,6 @@ export default {
           filter(row, value) {
             return getDictLabel(value, _that.dict.type.task_status)
           }
-          // filter(row) {
-          //   // console.log(row, value)
-          //   // console.log(row)
-          //   if (row.taskStatus == '0') {
-          //     return '未下发'
-          //   } else if (row.taskStatus == '1') {
-          //     return '执行中'
-          //   } else if (row.taskStatus == '2') {
-          //     return '已完成'
-          //   } else if (row.taskStatus == '3') {
-          //     return '已取消'
-          //   } else if (row.taskStatus == '-1') {
-          //     return '异常'
-          //   } else if (row.taskStatus == '4') {
-          //     return 'a到b任务完成'
-          //   } else {
-          //     return row.taskStatus
-          //   }
-          // }
         },
         {
           label: '任务类型',
@@ -356,6 +330,11 @@ export default {
           prop: 'locationCode',
           istrue: true
         },
+        {
+          label: 'rcs/agv下发任务',
+          prop: 'punchNo',
+          istrue: true
+        },
         {
           label: 'AGV目标码头',
           prop: 'agvNo',
@@ -378,26 +357,24 @@ export default {
           buttons: [
             {
               name: '重新下发',
-              event: 'handleUpdate',
-              disable(row, prop) {
-                if (row.taskStatus == '2') {
-                  return true
-                } else if (row.taskStatus == '0') {
-                  return true
-                }
-              }
+              event: 'handleUpdate'
+              // disable(row, prop) {
+              //   if (row.taskStatus == '2') {
+              //     return true
+              //   }
+              // }
             },
             {
               name: '取消任务',
               event: 'handleDelete',
               disable(row, prop) {
-                if (row.taskStatus == '2') {
-                  return true
-                } else if (row.taskStatus == '0') {
-                  return true
-                } else if (row.taskStatus == '3') {
-                  return true
-                }
+                // if (row.taskStatus == '2') {
+                //   return true
+                // } else if (row.taskStatus == '0') {
+                //   return true
+                // } else if (row.taskStatus == '3') {
+                //   return true
+                // }
               }
             }
           ]
@@ -477,92 +454,8 @@ export default {
     getBasePointGroup().then((res) => {
       this.pointGroupNameList = res.data
     })
-
-    // getTableHeader('task_management').then((res) => {
-    //   res.data.forEach((item) => {
-    //     item.minWidth = 140
-    //   })
-
-    //   res.data[4].filter = function (row) {
-    //     if (row.taskType == '0') {
-    //       return '入库任务'
-    //     } else if (row.taskType == '1') {
-    //       return '出库任务'
-    //     } else if (row.taskType == '2') {
-    //       return '搬运任务'
-    //     } else {
-    //       return '--'
-    //     }
-    //   }
-    //   res.data[5].filter = function (row) {
-    //     if (row.abnormalStatus == '0') {
-    //       return '正常'
-    //     } else if (row.abnormalStatus == '1') {
-    //       return '异常'
-    //     } else {
-    //       return '--'
-    //     }
-    //   }
-    //   res.data[8].filter = function (row) {
-    //     if (row.taskStatus == '0') {
-    //       return '未下发'
-    //     } else if (row.taskStatus == '1') {
-    //       return '执行中'
-    //     } else if (row.taskStatus == '2') {
-    //       return '已完成'
-    //     } else if (row.taskStatus == '3') {
-    //       return '下发失败'
-    //     } else {
-    //       return '--'
-    //     }
-    //   }
-
-    //   res.data[9].filter = function (row) {
-    //     if (row.taskStyle == '0') {
-    //       return 'PDA作业'
-    //     } else if (row.taskStyle == '1') {
-    //       return 'CTU作业'
-    //     } else if (row.taskStyle == '2') {
-    //       return 'AGV作业'
-    //     } else {
-    //       return '--'
-    //     }
-    //   }
-
-    //   this.tableConfig = [
-    //     ...res.data,
-    //     {
-    //       label: '操作',
-    //       prop: 'operating',
-    //       istrue: true,
-    //       type: 'button',
-    //       width: 180,
-    //       fixed: 'right',
-    //       buttons: [
-    //         {
-    //           name: '重新下发',
-    //           event: 'handleUpdate'
-    //         },
-    //         {
-    //           name: '取消任务',
-    //           event: 'handleDelete'
-    //         }
-    //       ]
-    //     }
-    //   ]
-    // })
-  },
-  // },
-  computed: {
-    // numCn() {
-    //   const obj = {}
-    //   this.devNameArr.forEach((item, index) => {
-    //     obj[item.devName] = item.devCode
-    //   })
-    //   console.log(obj)
-    //   return obj[this.form.devCode]
-    // }
   },
+  computed: {},
 
   methods: {
     // 分页
@@ -581,7 +474,6 @@ export default {
     formatStringToTimestamp(formattedString) {
       // 解析格式化时间字符串为Date对象
       let date = new Date(formattedString)
-
       // 检查Date对象是否有效
       if (!isNaN(date.getTime())) {
         // 获取时间戳
@@ -606,7 +498,6 @@ export default {
         res.rows = res.rows.sort((a, b) => {
           return this.formatStringToTimestamp(b['createTime']) - this.formatStringToTimestamp(a['createTime'])
         })
-        console.log(res.rows)
         this.cheshiList = res.rows
         this.paging.total = res.total
         this.loading = false
diff --git a/vue.config.js b/vue.config.js
index 505ddad..4c64671 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,7 +36,7 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://127.0.0.1:8031`, 
-        target: `http://127.0.0.1:8031`, 
+        target: `http://192.168.7.4:8030`, 
         // target: `http://192.168.0.110:8030`, 
         // target: `http://192.168.0.105:8030`, 
         // target: `http://120.77.94.227:8030`,