From 2982ff878661711da07d91ad75fc535ef60c9d2c Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Fri, 6 Sep 2024 17:57:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/distribution/createTask.js         | 334 ++++++++++++++++++
 src/page/login/userlogin.vue                  |   2 +-
 .../checkInventoryTask/createTaskTemp.vue     | 232 +++++++++++-
 3 files changed, 559 insertions(+), 9 deletions(-)

diff --git a/src/option/distribution/createTask.js b/src/option/distribution/createTask.js
index c61619d7..14224f91 100644
--- a/src/option/distribution/createTask.js
+++ b/src/option/distribution/createTask.js
@@ -170,3 +170,337 @@ export const columnList = [
     sortable: false,
   },
 ];
+// 盘点明细
+export const columnListInventory = [
+  {
+    prop: '',
+    label: '复选框',
+    type: 0,
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: '',
+    label: '序号',
+    type: 12,
+    values: '',
+    width: 55,
+    fixed: true,
+  },
+
+  {
+    prop: 'orderCode',
+    label: '订单自编号',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+  {
+    prop: 'orderPackageCode',
+    label: '包条',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+  {
+    prop: 'questTarget',
+    label: '品类',
+    type: 3,
+    values: '',
+    width: '150',
+    checkarr: [
+      {
+        value: 1,
+        label: '定制品',
+      },
+      {
+        value: 2,
+        label: '零担',
+      },
+      {
+        value: 3,
+        label: '库存品',
+      },
+    ],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+  {
+    prop: 'questStatus',
+    label: '盘点状态',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [
+      {
+        value: 0,
+        label: '待盘点',
+      },
+      {
+        value: 1,
+        label: '已盘',
+      },
+      {
+        value: 2,
+        label: '未盘点',
+      },
+      {
+        value: 3,
+        label: '已排除',
+      },
+    ],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+  {
+    prop: 'positionCode',
+    label: '货位',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+  {
+    prop: 'materialName',
+    label: '物料名称',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+  {
+    prop: 'stockNum',
+    label: '数量',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+  {
+    prop: 'trayCode',
+    label: '托盘码',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+  {
+    prop: 'trayName',
+    label: '托盘名称',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+  {
+    prop: 'isNew',
+    label: '是否新增',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+  {
+    prop: 'groundingPositionCode',
+    label: '上架后库位',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+  {
+    prop: 'newTrayCode',
+    label: '移动托盘',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+  {
+    prop: 'newTrayName',
+    label: '移动托盘名称',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+  {
+    prop: 'isChange',
+    label: '是否数量变更',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+  {
+    prop: 'isChangeAt',
+    label: '是否库位或托盘变更',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+  {
+    prop: 'inventoryPerson',
+    label: '盘点人',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+  {
+    prop: 'inventoryDate',
+    label: '盘点时间',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+  {
+    prop: 'firsts',
+    label: '一级品类',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+  {
+    prop: 'second',
+    label: '二级品类',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+  {
+    prop: 'thirdProduct',
+    label: '三级品类',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+  {
+    prop: 'categoryName',
+    label: '产品名称',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+  {
+    prop: 'materialCode',
+    label: '物料编码',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'brandName',
+    label: '品牌',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+  {
+    prop: '',
+    label: '操作',
+    type: 6,
+    values: '',
+    width: '120',
+    checkarr: [],
+    fixed: 'right',
+    sortable: false,
+  },
+];
diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue
index 4887dcd1..a7fa7847 100644
--- a/src/page/login/userlogin.vue
+++ b/src/page/login/userlogin.vue
@@ -61,7 +61,7 @@
       </div>
     </el-form-item>
 
-    <el-checkbox v-model="checked2">记住密码</el-checkbox>
+    <el-checkbox>记住密码</el-checkbox>
     <el-form-item v-if="this.website.captchaMode" prop="code">
       <el-row :span="24">
         <el-col :span="16">
diff --git a/src/views/distribution/checkInventoryTask/createTaskTemp.vue b/src/views/distribution/checkInventoryTask/createTaskTemp.vue
index 962f7d97..d40c0106 100644
--- a/src/views/distribution/checkInventoryTask/createTaskTemp.vue
+++ b/src/views/distribution/checkInventoryTask/createTaskTemp.vue
@@ -25,6 +25,7 @@
             <el-button type="primary" icon="CircleCloseFilled" @click="discard"
               >废弃盘点任务</el-button
             >
+            <el-button type="primary" icon="Clock" @click="extension">延期盘点任务</el-button>
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -52,7 +53,7 @@
           <template #default="slotProps">
             <template v-if="slotProps.scope.column.label === '操作'">
               <div class="ElBtnClass">
-                <el-button @click="view(slotProps.scope)">查看</el-button>
+                <el-text @click="Inventoried(slotProps.scope)">盘点明细</el-text>
               </div>
             </template>
 
@@ -62,7 +63,7 @@
                 cancel-button-text="取消"
                 icon="Download"
                 icon-color="#626AEF"
-                title="是否导出数据?"
+                title="是否导出数据？"
                 @confirm="ExportDataIndexRwo(slotProps.scope.row)"
               >
                 <template #reference>
@@ -175,6 +176,119 @@
         </el-text>
       </template>
     </DeleteWarningDialog>
+
+    <!-- 任务延期弹窗 -->
+    <el-dialog
+      v-model="extensiondialog"
+      title="请选择盘点任务延期时间"
+      width="30%"
+      :close-on-click-modal="false"
+      :show-close="false"
+    >
+      <div v-loading="extensionloading" element-loading-text="Loading...">
+        <el-date-picker
+          v-model="extensionTime"
+          type="datetime"
+          placeholder="请选择盘点延期时间"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
+        />
+      </div>
+
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="extensiondialog = false">关闭</el-button>
+          <el-button type="primary" @click="extensionsubmit" :disabled="extensionloading">
+            提交
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+
+    <!-- 已/未盘点明细 -->
+    <el-dialog
+      v-model="Inventorydialog"
+      title="盘点明细"
+      width="80%"
+      :fullscreen="Isitfullscreen"
+      :show-close="false"
+      class="el_Inventorydialog"
+    >
+      <template #header>
+        <div class="el_dialog__header">
+          <div>
+            <span>盘点明细</span>
+          </div>
+          <div>
+            <el-icon @click="Isfullscreen"><FullScreen /></el-icon>
+            <el-icon @click="Inventorydialog = false"><Close /></el-icon>
+          </div>
+        </div>
+      </template>
+
+      <el-tabs type="border-card">
+        <el-tab-pane label="已盘点明细">已盘点明细</el-tab-pane>
+        <el-tab-pane label="未盘点明细">未盘点明细</el-tab-pane>
+        <!-- 首页表格 -->
+        <el-row>
+          <!-- 列表模块 -->
+          <tablecmt
+            class="InventorytableNode"
+            :columnList="details.columnListInventory"
+            :tableData="data"
+            :loading="loadingObj.list"
+            @inputTxt="inputsc"
+            @timeCheck="timesc"
+            @btnCheck="btnsc"
+            @selectCheck="selectsc"
+            @selection="selectionChange"
+          >
+            <template #default="slotProps">
+              <template v-if="slotProps.scope.column.label === '操作'">
+                <div class="ElBtnClass">
+                  <el-text @click="Editinventory(slotProps.scope.row)">编辑</el-text>
+                </div>
+              </template>
+
+              <template v-if="slotProps.scope.column.label === '盘点任务编号'">
+                <el-popconfirm
+                  confirm-button-text="确定"
+                  cancel-button-text="取消"
+                  icon="Download"
+                  icon-color="#626AEF"
+                  title="是否导出数据?"
+                  @confirm="ExportDataIndexRwo(slotProps.scope.row)"
+                >
+                  <template #reference>
+                    <el-text>
+                      {{ slotProps.scope.row.questNum }}
+                    </el-text>
+                  </template>
+                </el-popconfirm>
+              </template>
+            </template>
+          </tablecmt>
+        </el-row>
+        <!-- 分页模块 -->
+        <el-row class="el-fy">
+          <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
+            <div></div>
+            <el-pagination
+              align="right"
+              background
+              @size-change="sizeChange"
+              @current-change="currentChange"
+              :current-page="inventorypage.currentPage"
+              :page-sizes="[30, 50, 80, 120]"
+              :page-size="inventorypage.pageSize"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="inventorypage.total"
+            >
+            </el-pagination>
+          </div>
+        </el-row>
+      </el-tabs>
+    </el-dialog>
   </basic-container>
   <!-- 列表配置显示 -->
   <edittablehead
@@ -187,7 +301,7 @@
 
 <script setup>
 import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
-import { columnList } from '@/option/distribution/createTask.js';
+import { columnList, columnListInventory } from '@/option/distribution/createTask.js';
 import { processRowProperty, setNodeHeight } from '@/utils/util';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import { downloadXls, handleClearTableQuery } from '@/utils/util';
@@ -197,12 +311,11 @@ import {
   getDictList,
   postAddtaskQuest,
   $_postBatchDelete,
+  $_updateDate,
 } from '@/api/distribution/createTask';
 import DeleteWarningDialog from '@/components/popupnotification/popupnotification.vue';
 import { useStore } from 'vuex';
 import dayjs from 'dayjs';
-import { Value } from 'sass';
-import error from '@/error';
 const $router = useRouter(); //跳转
 const $useStore = useStore(); //权限
 const $route = useRoute(); //获取地址栏参数
@@ -213,7 +326,12 @@ const InventoryPopup = ref(false); //创建盘点任务弹窗
 const popupnotificationloading = ref(false);
 const popupnotification = ref(false);
 const ruleFormRef = ref(null);
+const Isitfullscreen = ref(false);
+const extensiondialog = ref(false);
 const formInventoryloading = ref(false);
+const extensionTime = ref(null);
+const extensionloading = ref(false);
+const Inventorydialog = ref(false);
 const rules = reactive({
   time: [{ required: true, message: '请选择盘点时间', trigger: 'blur' }],
 });
@@ -257,9 +375,11 @@ const details = reactive({
   stockupDate: [],
   /** 列表 */
   columnList,
-
+  columnListInventory,
   /** 列表数据 */
-  data: [{}],
+  data: [],
+  // 盘点明细
+  inventoryData:[],
   /** 页面loading */
   loadingObj: {
     /** 列表加载loading */
@@ -276,7 +396,12 @@ const details = reactive({
     pageSize: 50,
     total: 0,
   },
-
+  // 盘点明细分页
+  inventorypage:{
+    currentPage: 1,
+    pageSize: 50,
+    total: 0,
+  },
   /** 弹出层显示 */
   popUpShow: {
     /** 包件明细 */
@@ -302,7 +427,9 @@ const {
   shortcuts,
   stockupDate,
   data,
+  inventoryData,
   loadingObj,
+  inventorypage,
   selectionList,
   drawerShow,
   page,
@@ -492,6 +619,7 @@ const onLoadPage = () => {
 onLoadPage();
 // 创建盘点任务
 const InventoryTask = () => {
+  formInventory.value = {};
   InventoryPopup.value = true;
 };
 // 废弃盘点任务
@@ -532,6 +660,60 @@ const handleDialogConfirm = () => {
       popupnotificationloading.value = false;
     });
 };
+
+// 延期盘点任务
+const extension = () => {
+  if (!details.selectionList.length) {
+    ElMessage({
+      message: '请选择要延期的盘点任务(单选操作)',
+      type: 'warning',
+    });
+    return;
+  }
+
+  if (details.selectionList.length > 1) {
+    ElMessage({
+      message: '单次只能勾选一个任务延期',
+      type: 'warning',
+    });
+    return;
+  }
+  extensionTime.value = null;
+  extensiondialog.value = true;
+};
+const extensionsubmit = () => {
+  if (!extensionTime.value) {
+    ElMessage({
+      message: '请选择延期时间',
+      type: 'warning',
+    });
+    return;
+  }
+  let data = {
+    id: details.selectionList[0].id,
+    startTime: details.selectionList[0].startTime,
+    endTime: extensionTime.value,
+  };
+  extensionloading.value = true;
+  $_updateDate(data)
+    .then(res => {
+      if (res.data.code == 200) {
+        ElMessage({
+          showClose: true,
+          message: res.data.msg,
+          type: 'success',
+        });
+        onLoad();
+        extensiondialog.value = false;
+      }
+    })
+    .catch(error => {
+      console.log(error, 'error');
+    })
+    .finally(() => {
+      extensionloading.value = false;
+    });
+};
 // 处理商场名称函数根据传入ID读取列表中的商场
 function matchInfoById(idArray, infoArray) {
   const matchedInfo = [];
@@ -553,6 +735,7 @@ const formInventoryChange = Value => {
   });
   formInventory.value.brandName = name.join(','); //处理品牌名称显示
 };
+
 // 盘点提交
 const InventorySubmit = async () => {
   try {
@@ -622,6 +805,26 @@ const ExportDataIndexRwo = row => {
       details.loadingObj.list = false;
     });
 };
+// 是否全屏
+const Isfullscreen = () => {
+  Isitfullscreen.value = !Isitfullscreen.value;
+  const _node = document.querySelector('.InventorytableNode');
+  setNodeHeight(_node, '', true);
+};
+// 已盘点明细
+const Inventoried = async () => {
+  Inventorydialog.value = true;
+  await nextTick();
+  const _node = document.querySelector('.InventorytableNode');
+  setNodeHeight(_node, '70vh', true);
+};
+// 盘点明细编辑
+const Editinventory = () => {
+  ElMessage({
+    message: '功能维护中...',
+    type: 'warning',
+  });
+};
 </script>
 
 <style scoped lang="scss">
@@ -652,4 +855,17 @@ const ExportDataIndexRwo = row => {
 .el_textBtn {
   cursor: pointer;
 }
+.el_dialog__header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  i {
+    margin: 0 8px;
+  }
+}
+:deep(.el_Inventorydialog) {
+  .el-tab-pane {
+    display: none;
+  }
+}
 </style>