wangxin 4 ヶ月 前
コミット
345a3bee29

+ 20 - 0
src/api/business/taksStockLot.js

@@ -11,6 +11,16 @@ export function listTaksStockLot(query) {
   })
 }
 
+
+// 查询盘点批次信息详细
+export function getOutsourceInfo(query) {
+  return request({
+    url: baseUrl + '/business/taksStockLot/outsourceInfo',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询盘点批次信息详细
 export function getTaksStockLot(id) {
   return request({
@@ -79,6 +89,16 @@ export function singleInventoryCheck(data) {
 }
 
 
+export function saveOutsourceInfo(data) {
+  return request({
+    url: baseUrl + '/business/taksStockLot/saveOutsourceInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+
+
 // 删除盘点批次信息
 export function delTaksStockLot(id) {
   return request({

+ 394 - 0
src/views/business/inventoryCheck/OutsourceCheckFom.vue

@@ -0,0 +1,394 @@
+<template>
+  <el-drawer
+    title="首序一键盘点"
+    :with-header="false"
+    v-model="visible"
+    direction="rtl"
+    size="100%"
+  >
+    <div class="form-container column-container">
+      <div class="form-btns-container">
+        <span class="title-label">
+          <el-icon>
+            <Document />
+          </el-icon>
+          <span>外协一键盘点</span>
+        </span>
+        <div class="close-btn" @click="cancel">
+          <i class="fa fa-times" aria-hidden="true" />
+          <!-- <span>关闭</span> -->
+        </div>
+      </div>
+      <el-form
+        class="list-search-container"
+        :model="queryTaksParams"
+        ref="queryRef"
+        :inline="true"
+        style="margin-right: 0px"
+      >
+        <!-- style="float: inline-end" -->
+        <!-- && dataList.length > 0 -->
+        <el-form-item label="批次号:">
+          <el-input
+            placeholder="请输入批次号"
+            v-model.trim="queryTaksParams.lotCode"
+            @keydown.enter.prevent
+            clearable
+            style="width: 130px"
+          />
+        </el-form-item>
+
+        <el-form-item label="外协单号:">
+          <el-input
+            placeholder="请输入外协单号"
+            v-model.trim="queryTaksParams.outsourceFormNo"
+            @keydown.enter.prevent
+            clearable
+            style="width: 130px"
+          />
+        </el-form-item>
+
+        <el-form-item style="margin-left: 0">
+          <el-button type="info" icon="Search" @click="getList"
+            >搜索
+          </el-button>
+          <el-button
+            type="primary"
+            style="background-color: #409eff"
+            v-if="!loading && detailInfo.status != 2"
+            @click="handleInventory"
+            >一键盘点
+          </el-button>
+        </el-form-item>
+      </el-form>
+      <div class="el-table-container">
+        <div class="el-table-inner-container">
+          <el-table
+            ref="tableRef"
+            v-loading="loading"
+            :data="dataList"
+            size="small"
+            border
+            height="100%"
+            @selection-change="handleSelectionChange"
+          >
+            <!-- <el-table-column type="selection" width="48" align="center" /> -->
+            <el-table-column
+              label="行号"
+              type="index"
+              align="center"
+              width="48"
+            />
+            <el-table-column
+              label="外协单号"
+              align="center"
+              prop="outsourceFormNo"
+              width="110"
+            />
+            <el-table-column
+              label="批次号"
+              prop="lotCode"
+              align="center"
+              width="120px"
+            >
+            </el-table-column>
+            <el-table-column
+              label="产品描述"
+              align="center"
+              prop="productDescription"
+            />
+            <el-table-column
+              label="生产状态"
+              prop="isProductStatus"
+              width="90"
+              align="center"
+            >
+              <template #default="scope">
+                <dict-tag
+                  :options="inventory_production_status"
+                  :value="scope.row.isProductStatus"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="投入数"
+              align="center"
+              prop="prodNum"
+              width="80"
+            />
+            <el-table-column
+              label="盘点数量"
+              align="center"
+              prop="taksStockNum"
+              width="100"
+            >
+              <!-- <template #default="scope">
+                <el-input-number
+                  v-if="scope.row.editStatus"
+                  v-model="scope.row.taksStockNum"
+                  controls-position="right"
+                  style="width: 100px"
+                  :min="0"
+                  :precision="0"
+                  :max="99999"
+                  @input="
+                    (val) => {
+                      handleChangeTaksStockNum(val, scope.row, scope.$index);
+                    }
+                  "
+                />
+                <div v-else>{{ scope.row.taksStockNum }}</div>
+              </template> -->
+            </el-table-column>
+            <el-table-column label="标识" width="300" align="center">
+              <template #default="scope">
+                <el-tag
+                  v-if="scope.row.isWaste == 1"
+                  class="spacing"
+                  type="danger"
+                  >{{ "批废" }}</el-tag
+                >
+                <el-tag
+                  v-if="scope.row.isAmend == 1"
+                  class="spacing"
+                  type="danger"
+                  >{{ "工艺修改" }}</el-tag
+                >
+                <el-tag
+                  v-if="scope.row.isWasteRecycling == 1"
+                  class="spacing"
+                  type="primary"
+                  >{{ "废品回用" }}</el-tag
+                >
+                <el-tag
+                  v-if="scope.row.fromLotId != 0"
+                  class="spacing"
+                  type="warning"
+                  >{{ "分批" }}</el-tag
+                >
+                <el-tag
+                  v-if="scope.row.isSuperaddition == 1"
+                  class="spacing"
+                  type="info"
+                  >{{ "追增" }}</el-tag
+                >
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="盘点状态"
+              prop="isTaksStock"
+              width="200"
+              align="center"
+            >
+              <template #default="scope">
+                <dict-tag
+                  :options="is_taks_stock"
+                  :value="scope.row.isTaksStock"
+                />
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+      <!-- 分页 -->
+      <paginationMax
+        v-show="total > 0"
+        :total="total"
+        v-model:page="queryTaksParams.pageNum"
+        v-model:limit="queryTaksParams.pageSize"
+        @pagination="getList"
+      />
+    </div>
+  </el-drawer>
+</template>
+<script setup>
+import {
+  getProductionPlanDetail,
+  getNotTaksLot,
+  getLotNumber,
+  getOutsourceInfo,
+  singleInventoryCheck,
+  multiplyInventoryCheck,
+  saveOutsourceInfo,
+} from "@/api/business/taksStockLot";
+import { ref } from "vue";
+import router from "@/router";
+import { ElMessageBox } from "element-plus";
+const emit = defineEmits(["handleSaveSuccess"]);
+const { proxy } = getCurrentInstance();
+/** 字典 */
+const { is_identification } = proxy.useDict("is_identification");
+const { is_taks_stock } = proxy.useDict("is_taks_stock");
+const { inventory_production_status } = proxy.useDict(
+  "inventory_production_status"
+);
+/** 表单抽屉 页变量 */
+const loading = ref(false);
+const visible = ref(false);
+const detailInfo = ref({});
+const dataList = ref([]);
+const total = ref(0);
+const productionPlanDetaiList = ref([]);
+const tableRef = ref(null);
+const isInventoryMode = ref(true);
+const deptList = ref([]);
+const selections = ref([]);
+/** 查询对象 */
+const queryTaksParams = ref({
+  pageNum: 1,
+  pageSize: 50,
+  productionPlanDetailId: null,
+  deptId: null,
+});
+
+/****************************  方法区  ****************************/
+/** 打开抽屉 */
+const open = (row) => {
+  visible.value = true;
+  detailInfo.value = proxy.deepClone(row);
+  reset();
+  getList();
+};
+function getProductionPlanDetailList() {
+  getProductionPlanDetail(queryTaksParams.value).then((res) => {
+    if (res.data.length > 0) {
+      productionPlanDetaiList.value = res.data;
+      queryTaksParams.value.productionPlanDetailId = res.data[0].value;
+      getList();
+    } else {
+      productionPlanDetaiList.value = [];
+      queryTaksParams.value.productionPlanDetailId = null;
+      dataList.value = [];
+      proxy.$modal.msgError("当前工段无未生产的批次");
+      return;
+    }
+  });
+}
+
+function handleSelectionChange(selection) {
+  if (isInventoryMode.value) {
+    selections.value = selection;
+    console.log(selections.value);
+  }
+}
+
+//一键盘点
+function handleInventory() {
+  loading.value = true;
+  //弹出确认框,确认用户是否确认盘点
+  ElMessageBox.confirm("是否确认一键盘点,将会盘点所有未收回的批次?")
+    .then(() => {
+      saveOutsourceInfo({ takeStockPeriodId: detailInfo.value.id }).then(
+        (res) => {
+          if (res.code == 200) {
+            proxy.$modal.msgSuccess("操作成功");
+            loading.value = false;
+            reset();
+            getList();
+          } else {
+            proxy.$modal.msgError("操作失败");
+          }
+        }
+      );
+    })
+    .catch(() => {});
+}
+
+function getList() {
+  loading.value = true;
+
+  console.log("盘点明细", detailInfo.value);
+  queryTaksParams.value.takeStockPeriodId = detailInfo.value.id;
+  getOutsourceInfo(queryTaksParams.value).then((res) => {
+    if (res.code == 200) {
+      dataList.value = res.rows;
+      total.value = res.total;
+      loading.value = false;
+      console.log("外协信息", dataList.value);
+    }
+  });
+}
+function handleProductionPlanChange() {
+  proxy.$refs.tableRef.clearSelection();
+  getList();
+}
+//编辑
+function handleEdit(row, index) {
+  //判断是否能编辑
+  //分批,废品回用,增批不算在允许盘点的个数内
+  if (
+    row.isWasteRecycling == 1 ||
+    row.fromLotId != 0 ||
+    row.isSuperaddition == 1
+  ) {
+    row.editStatus = true;
+    row.taksStockNum = row.prodNum;
+    row.isTaksStock = "1";
+  } else {
+    getLotNumber(queryTaksParams.value).then((res) => {
+      if (res.data.allowLotNum > 0) {
+        row.editStatus = true;
+        console.log(row);
+        row.taksStockNum = row.prodNum;
+        row.isTaksStock = "1";
+        console.log(row);
+      } else {
+        proxy.$modal.msgError(
+          "当前常规未生产批次数量多于可盘点批次数量,不可编辑!"
+        );
+        return;
+      }
+    });
+  }
+}
+//取消编辑
+function handleCancel(row, index) {
+  dataList.value[index].editStatus = false;
+  getList();
+}
+//保存
+function handleSave(row) {
+  singleInventoryCheck(row).then((res) => {
+    if (res.code == 200) {
+      proxy.$modal.msgSuccess("盘点成功");
+      if (res.data) {
+        getList();
+      } else {
+        //重新查计划单
+        getProductionPlanDetailList();
+      }
+    }
+  });
+}
+function handleDeptChange() {
+  proxy.$refs.tableRef.clearSelection();
+  console.log(queryTaksParams.value);
+  getProductionPlanDetailList();
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  visible.value = false;
+  reset();
+  emit("handleSaveSuccess");
+};
+
+/** 表单重置 */
+const reset = () => {
+  const queryTaksParams = ref({
+    pageNum: 1,
+    pageSize: 50,
+  });
+};
+
+/** 暴露给父组件的方法 */
+defineExpose({
+  open,
+});
+</script>
+<style scoped>
+.el-message-box {
+  max-width: none !important;
+  width: 420px;
+}
+</style>

+ 369 - 120
src/views/business/inventoryCheck/form.vue

@@ -1,5 +1,11 @@
 <template>
-  <el-drawer title="外协单信息" :with-header="false" v-model="visible" direction="rtl" size="100%">
+  <el-drawer
+    title="外协单信息"
+    :with-header="false"
+    v-model="visible"
+    direction="rtl"
+    size="100%"
+  >
     <div class="form-container column-container">
       <div class="form-btns-container">
         <span class="title-label">
@@ -14,166 +20,401 @@
           <!-- <span>关闭</span> -->
         </div>
       </div>
-      <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true"
-        style="margin-right: 0px">
+      <el-form
+        class="list-search-container"
+        :model="queryParams"
+        ref="queryRef"
+        :inline="true"
+        style="margin-right: 0px"
+      >
         <el-form-item class="section-title" label="盘点批次列表" />
         <el-form-item label="批次号:">
-          <el-input placeholder="请输入批次号" v-model.trim="queryParams.lotCode" @keydown.enter.prevent clearable
-            style="width: 130px" />
+          <el-input
+            placeholder="请输入批次号"
+            v-model.trim="queryParams.lotCode"
+            @keydown.enter.prevent
+            clearable
+            style="width: 130px"
+          />
         </el-form-item>
         <el-form-item label="产品描述:">
-          <el-input placeholder="请输入产品描述" v-model.trim="queryParams.productDescription" @keydown.enter.prevent clearable
-            style="width: 130px" />
+          <el-input
+            placeholder="请输入产品描述"
+            v-model.trim="queryParams.productDescription"
+            @keydown.enter.prevent
+            clearable
+            style="width: 130px"
+          />
         </el-form-item>
         <el-form-item label="生产状态:">
-          <el-select v-model="queryParams.isProductStatus" clearable placeholder="请选择生产状态" style="width: 145px">
-            <el-option v-for="dict in inventory_production_status" :key="dict.value" :label="dict.label"
-              :value="dict.value"></el-option>
+          <el-select
+            v-model="queryParams.isProductStatus"
+            clearable
+            placeholder="请选择生产状态"
+            style="width: 145px"
+          >
+            <el-option
+              v-for="dict in inventory_production_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="标识:">
-          <el-select style="width: 160px" multiple v-model="queryParams.flags" collapse-tags collapse-tags-tooltip
-            clearable placeholder="请选择标识">
-            <el-option v-for="item in is_identification" :key="item.value" :label="item.label"
-              :value="item.value"></el-option>
+          <el-select
+            style="width: 160px"
+            multiple
+            v-model="queryParams.flags"
+            collapse-tags
+            collapse-tags-tooltip
+            clearable
+            placeholder="请选择标识"
+          >
+            <el-option
+              v-for="item in is_identification"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item class="section-title" label="请选择当前工段:">
-          <el-select-v2 v-model="queryParams.deptId" :options="deptList" placeholder="请选择工段" style="width: 120px" />
+          <el-select-v2
+            v-model="queryParams.deptId"
+            :options="deptList"
+            placeholder="请选择工段"
+            style="width: 120px"
+          />
         </el-form-item>
         <el-form-item label="盘点状态:">
-          <el-select v-model="queryParams.isTaksStock" clearable placeholder="请选择盘点状态" style="width: 145px">
-            <el-option v-for="dict in is_taks_stock" :key="dict.value" :label="dict.label"
-              :value="dict.value"></el-option>
+          <el-select
+            v-model="queryParams.isTaksStock"
+            clearable
+            placeholder="请选择盘点状态"
+            style="width: 145px"
+          >
+            <el-option
+              v-for="dict in is_taks_stock"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item style="margin-left: 0">
-          <el-button type="info" icon="Search" @click="handleQuery">搜索
+          <el-button type="info" icon="Search" @click="handleQuery"
+            >搜索
           </el-button>
-          <el-button type="info" icon="Download" @click="handleExport" v-hasPermi="['business:inventoryCheck:inventoryDetailCheck']">导出盘点明细
+          <el-button
+            type="info"
+            icon="Download"
+            @click="handleExport"
+            v-hasPermi="['business:inventoryCheck:inventoryDetailCheck']"
+            >导出盘点明细
           </el-button>
-          <el-button :disabled="queryParams.deptId == null || queryParams.deptId == '0'" type="primary" icon="Check"   v-hasPermi="['business:inventoryCheck:notProductionCheck']"
-            @click="handleTaksLot">未生产批次盘点
+          <el-button
+            :disabled="queryParams.deptId == null || queryParams.deptId == '0'"
+            type="primary"
+            icon="Check"
+            v-hasPermi="['business:inventoryCheck:notProductionCheck']"
+            @click="handleTaksLot"
+            >未生产批次盘点
           </el-button>
-          <el-button v-if="detailInfo.status != 2" type="primary" icon="List" @click="showOutsourceCheckDialog">外协发出单盘点
+          <el-button
+            v-if="detailInfo.status != 2"
+            type="primary"
+            icon="List"
+            v-hasPermi="['business:inventoryCheck:outsourceCheck']"
+            @click="outsourceCheckFrom"
+            >外协发出盘点
           </el-button>
-          <el-button type="info" icon="Download" @click="handleExportStorage"  v-hasPermi="['business:inventoryCheck:notRetrievalCheck']">导出零存库未领取批次
+          <!-- <el-button
+            v-if="detailInfo.status != 2"
+            type="primary"
+            icon="List"
+            @click="showOutsourceCheckDialog"
+            >外协发出单盘点
+          </el-button> -->
+          <el-button
+            type="info"
+            icon="Download"
+            @click="handleExportStorage"
+            v-hasPermi="['business:inventoryCheck:notRetrievalCheck']"
+            >导出零存库未领取批次
           </el-button>
         </el-form-item>
       </el-form>
       <div class="el-table-container">
         <div class="el-table-inner-container">
-          <el-table v-loading="loading" :data="dataList" size="small" border height="100%">
-            <el-table-column label="行号" type="index" align="center" width="48" />
-            <el-table-column label="批次号" prop="lotCode" align="center" width="120px">
+          <el-table
+            v-loading="loading"
+            :data="dataList"
+            size="small"
+            border
+            height="100%"
+          >
+            <el-table-column
+              label="行号"
+              type="index"
+              align="center"
+              width="48"
+            />
+            <el-table-column
+              label="批次号"
+              prop="lotCode"
+              align="center"
+              width="120px"
+            >
               <template #default="scope">
-                <el-button link type="primary" @click="handleColumnClick(scope.row.lotCode)"><span>{{ scope.row.lotCode
-                    }}</span></el-button>
+                <el-button
+                  link
+                  type="primary"
+                  @click="handleColumnClick(scope.row.lotCode)"
+                  ><span>{{ scope.row.lotCode }}</span></el-button
+                >
               </template>
             </el-table-column>
-            <el-table-column label="产品描述" align="center" prop="productDescription" />
-            <el-table-column label="箱号" align="center" prop="carrierName" width="110" />
-            <el-table-column label="生产状态" prop="isProductStatus" width="90" align="center">
+            <el-table-column
+              label="产品描述"
+              align="center"
+              prop="productDescription"
+            />
+            <el-table-column
+              label="箱号"
+              align="center"
+              prop="carrierName"
+              width="110"
+            />
+            <el-table-column
+              label="生产状态"
+              prop="isProductStatus"
+              width="90"
+              align="center"
+            >
               <template #default="scope">
-                <dict-tag :options="inventory_production_status" :value="scope.row.isProductStatus" />
+                <dict-tag
+                  :options="inventory_production_status"
+                  :value="scope.row.isProductStatus"
+                />
               </template>
             </el-table-column>
-            <el-table-column label="工段" align="center" prop="deptName" width="90" />
-            <el-table-column label="工序" align="center" prop="processAlias" width="110" />
-            <el-table-column label="投入数" align="center" prop="prodNum" width="80" />
-            <el-table-column label="盘点数量" align="center" prop="taksStockNum" width="90">
+            <el-table-column
+              label="工段"
+              align="center"
+              prop="deptName"
+              width="90"
+            />
+            <el-table-column
+              label="工序"
+              align="center"
+              prop="processAlias"
+              width="110"
+            />
+            <el-table-column
+              label="投入数"
+              align="center"
+              prop="prodNum"
+              width="80"
+            />
+            <el-table-column
+              label="盘点数量"
+              align="center"
+              prop="taksStockNum"
+              width="90"
+            >
               <template #default="scope">
-                <el-input-number v-if="scope.row.editStatus" v-model="scope.row.taksStockNum" controls-position="right"
-                  style="width: 100px" :min="0" :precision="0" :max="99999"
-                  @input="(val) => { handleChangeTaksStockNum(val, scope.row, scope.$index) }" />
+                <el-input-number
+                  v-if="scope.row.editStatus"
+                  v-model="scope.row.taksStockNum"
+                  controls-position="right"
+                  style="width: 100px"
+                  :min="0"
+                  :precision="0"
+                  :max="99999"
+                  @input="
+                    (val) => {
+                      handleChangeTaksStockNum(val, scope.row, scope.$index);
+                    }
+                  "
+                />
                 <div v-else>{{ scope.row.taksStockNum }}</div>
               </template>
             </el-table-column>
-            <el-table-column label="外协单号" align="center" prop="outsourceFormNo" width="110" />
-            <el-table-column label="报工状态" align="center" prop="statusLabel" width="110">
+            <el-table-column
+              label="外协单号"
+              align="center"
+              prop="outsourceFormNo"
+              width="110"
+            />
+            <el-table-column
+              label="报工状态"
+              align="center"
+              prop="statusLabel"
+              width="110"
+            >
               <template #default="scope">
-               <span v-if="scope.row.statusLabel == 0">未开始</span>
-               <span v-if="scope.row.statusLabel == 1">进行中</span>
-               <span v-if="scope.row.statusLabel == 2">结束报工</span>
-               <span v-if="scope.row.statusLabel == 3">工序已完成</span>
-               <span v-if="scope.row.statusLabel == 4">待领取</span>
-               <span v-if="scope.row.statusLabel == 6">已周转</span>
-               <span v-if="scope.row.statusLabel == 7">已接收</span>
+                <span v-if="scope.row.statusLabel == 0">未开始</span>
+                <span v-if="scope.row.statusLabel == 1">进行中</span>
+                <span v-if="scope.row.statusLabel == 2">结束报工</span>
+                <span v-if="scope.row.statusLabel == 3">工序已完成</span>
+                <span v-if="scope.row.statusLabel == 4">待领取</span>
+                <span v-if="scope.row.statusLabel == 6">已周转</span>
+                <span v-if="scope.row.statusLabel == 7">已接收</span>
               </template>
             </el-table-column>
             <el-table-column label="标识" width="300" align="center">
               <template #default="scope">
-                <el-tag v-if="scope.row.isWaste == 1" class="spacing" type="danger">{{ "批废" }}</el-tag>
-                <el-tag v-if="scope.row.isAmend == 1" class="spacing" type="danger">{{ "工艺修改" }}</el-tag>
-                <el-tag v-if="scope.row.isWasteRecycling == 1" class="spacing" type="primary">{{ "废品回用" }}</el-tag>
-                <el-tag v-if="scope.row.fromLotId != 0" class="spacing" type="warning">{{ "分批" }}</el-tag>
-                <el-tag v-if="scope.row.isSuperaddition == 1" class="spacing" type="info">{{ "追增" }}</el-tag>
+                <el-tag
+                  v-if="scope.row.isWaste == 1"
+                  class="spacing"
+                  type="danger"
+                  >{{ "批废" }}</el-tag
+                >
+                <el-tag
+                  v-if="scope.row.isAmend == 1"
+                  class="spacing"
+                  type="danger"
+                  >{{ "工艺修改" }}</el-tag
+                >
+                <el-tag
+                  v-if="scope.row.isWasteRecycling == 1"
+                  class="spacing"
+                  type="primary"
+                  >{{ "废品回用" }}</el-tag
+                >
+                <el-tag
+                  v-if="scope.row.fromLotId != 0"
+                  class="spacing"
+                  type="warning"
+                  >{{ "分批" }}</el-tag
+                >
+                <el-tag
+                  v-if="scope.row.isSuperaddition == 1"
+                  class="spacing"
+                  type="info"
+                  >{{ "追增" }}</el-tag
+                >
               </template>
             </el-table-column>
-            <el-table-column label="盘点状态" prop="isTaksStock" width="200" align="center">
+            <el-table-column
+              label="盘点状态"
+              prop="isTaksStock"
+              width="200"
+              align="center"
+            >
               <template #default="scope">
-                <el-select v-model="scope.row.isTaksStock" placeholder="请选择盘点状态" style="width: 160px"
+                <el-select
+                  v-model="scope.row.isTaksStock"
+                  placeholder="请选择盘点状态"
+                  style="width: 160px"
                   v-if="scope.row.editStatus"
-                  @change="(val) => { handleChangeTaksStock(val, scope.row, scope.$index) }">
-                  <el-option v-for="dict in is_taks_stock" :key="dict.value" :label="dict.label"
-                    :value="dict.value"></el-option>
+                  @change="
+                    (val) => {
+                      handleChangeTaksStock(val, scope.row, scope.$index);
+                    }
+                  "
+                >
+                  <el-option
+                    v-for="dict in is_taks_stock"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
                 </el-select>
                 <div v-else>
-                  <dict-tag :options="is_taks_stock" :value="scope.row.isTaksStock" />
+                  <dict-tag
+                    :options="is_taks_stock"
+                    :value="scope.row.isTaksStock"
+                  />
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="操作" width="160" align="center" v-if="detailInfo.status != 2">
+            <el-table-column
+              label="操作"
+              width="160"
+              align="center"
+              v-if="detailInfo.status != 2"
+            >
               <template #default="scope">
-                <el-button link icon="Check" v-if="scope.row.editStatus" type="success"
-                  @click="handleSave(scope.row)">保存</el-button>
-                <el-button link icon="Edit" v-else type="warning" @click="handleEdit(scope.row, scope.$index)"
-                  v-hasPermi="['business:inventoryCheck:editDetail']">编辑</el-button>
-                <el-button link icon="Close" v-if="scope.row.editStatus" type="danger"
-                  @click="handleCancel(scope.row, scope.$index)">取消</el-button>
+                <el-button
+                  link
+                  icon="Check"
+                  v-if="scope.row.editStatus"
+                  type="success"
+                  @click="handleSave(scope.row)"
+                  >保存</el-button
+                >
+                <el-button
+                  link
+                  icon="Edit"
+                  v-else
+                  type="warning"
+                  @click="handleEdit(scope.row, scope.$index)"
+                  v-hasPermi="['business:inventoryCheck:editDetail']"
+                  >编辑</el-button
+                >
+                <el-button
+                  link
+                  icon="Close"
+                  v-if="scope.row.editStatus"
+                  type="danger"
+                  @click="handleCancel(scope.row, scope.$index)"
+                  >取消</el-button
+                >
               </template>
             </el-table-column>
           </el-table>
         </div>
-
       </div>
       <!-- 分页 -->
-      <paginationMax v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-        v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <paginationMax
+        v-show="total > 0"
+        :total="total"
+        v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getList"
+      />
     </div>
     <OutsourceCheckDialog ref="outsourceCheckDialogRef" />
     <taksForm ref="taksFormRef" @handleSaveSuccess="getList" />
+    <OutsourceCheckFom ref="outsourceCheckFom" @handleSaveSuccess="getList" />
   </el-drawer>
 </template>
 <script setup>
 import {
-  listTaksStockLot, updateTaksStockLot, updateNoStartLot, exportNoStartLot,getProductionPlanDetail
+  listTaksStockLot,
+  updateTaksStockLot,
+  updateNoStartLot,
+  exportNoStartLot,
+  getProductionPlanDetail,
 } from "@/api/business/taksStockLot";
-import {
-  exportStorageLot
-} from "@/api/business/storageRetrieval"
+import { exportStorageLot } from "@/api/business/storageRetrieval";
 import { getDeptList } from "@/api/business/planDetailSubDetail.js";
-import taksForm from "./notTaksForm.vue"
+import taksForm from "./notTaksForm.vue";
 import { ref } from "vue";
 import router from "@/router";
 import OutsourceCheckDialog from "./OutsourceCheckDialog.vue";
+import OutsourceCheckFom from "./OutsourceCheckFom.vue";
 const { proxy } = getCurrentInstance();
 /** 字典 */
 const { is_identification } = proxy.useDict("is_identification");
 const { is_taks_stock } = proxy.useDict("is_taks_stock");
-const { inventory_production_status } = proxy.useDict("inventory_production_status");
+const { inventory_production_status } = proxy.useDict(
+  "inventory_production_status"
+);
 
 // 组件
-const outsourceCheckDialogRef = ref(null)
+const outsourceCheckDialogRef = ref(null);
 
 /** 表单抽屉 页变量 */
 const loading = ref(false);
 const visible = ref(false);
 const detailInfo = ref({});
-const total = ref(0)
-const isDispatch = ref(false)
-const deptList = ref([])
-const dataList = ref([])
+const total = ref(0);
+const isDispatch = ref(false);
+const deptList = ref([]);
+const dataList = ref([]);
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
@@ -182,15 +423,17 @@ const queryParams = ref({
   lotCode: "",
   deptId: null,
   flags: null,
-  isTaksStock: null
+  isTaksStock: null,
 });
 
 /****************************  方法区  ****************************/
 /** 打开抽屉 */
 const open = (row) => {
   visible.value = true;
-  console.log(is_identification.value)
-  is_identification.value = is_identification.value.filter(item => item.value != 0)
+  console.log(is_identification.value);
+  is_identification.value = is_identification.value.filter(
+    (item) => item.value != 0
+  );
   reset();
   detailInfo.value = proxy.deepClone(row);
   getDeptList().then((response) => {
@@ -200,30 +443,30 @@ const open = (row) => {
       deptList.value.unshift({ label: "全部", value: "0" });
     }
     queryParams.value.deptId = deptList.value[0].value;
-    queryParams.value.takeStockPeriodId = row.id
+    queryParams.value.takeStockPeriodId = row.id;
     getList();
   });
-}
+};
 function getList() {
-  loading.value = true
-  listTaksStockLot(queryParams.value).then(res => {
-    res.rows.forEach(element => {
-      element.isTaksStock = element.isTaksStock + ""
-      element.taksStockNum = Number(element.taksStockNum)
+  loading.value = true;
+  listTaksStockLot(queryParams.value).then((res) => {
+    res.rows.forEach((element) => {
+      element.isTaksStock = element.isTaksStock + "";
+      element.taksStockNum = Number(element.taksStockNum);
     });
     dataList.value = res.rows;
     total.value = res.total;
-    loading.value = false
-  })
+    loading.value = false;
+  });
 }
 function handleEdit(row, index) {
-  row.editStatus = true
+  row.editStatus = true;
   console.log(row);
   if (row.isTaksStock != 1) {
-    row.taksStockNum = row.prodNum
-    row.isTaksStock = "1"
+    row.taksStockNum = row.prodNum;
+    row.isTaksStock = "1";
   }
-  console.log(row)
+  console.log(row);
 }
 //一键盘点
 // function handleTaksLot() {
@@ -235,27 +478,33 @@ function handleEdit(row, index) {
 //     }
 //   })
 // }
+
+//发出盘点按钮
+function outsourceCheckFrom() {
+  proxy.$refs.outsourceCheckFom.open(detailInfo.value);
+}
 function handleTaksLot() {
-  getProductionPlanDetail(queryParams.value).then(res=>{
-    if(res.data.length>0){
-      let detail ={}
-      detail.deptId = queryParams.value.deptId
-      detail.deptList = deptList.value
-      detail.takeStockPeriodId = queryParams.value.takeStockPeriodId
-      detail.status = detailInfo.value.status
-      proxy.$refs.taksFormRef.open(detail)
-    }else{
-      proxy.$modal.msgError("当前工段无未生产的批次")
+  getProductionPlanDetail(queryParams.value).then((res) => {
+    if (res.data.length > 0) {
+      let detail = {};
+      detail.deptId = queryParams.value.deptId;
+      detail.deptList = deptList.value;
+      detail.takeStockPeriodId = queryParams.value.takeStockPeriodId;
+      detail.status = detailInfo.value.status;
+      proxy.$refs.taksFormRef.open(detail);
+    } else {
+      proxy.$modal.msgError("当前工段无未生产的批次");
     }
-  })
+  });
 }
+
 function handleSave(row) {
-  updateTaksStockLot(row).then(res => {
+  updateTaksStockLot(row).then((res) => {
     if (res.code == 200) {
       proxy.$modal.msgSuccess("保存成功");
-      getList()
+      getList();
     }
-  })
+  });
 }
 /** 打开批次详情页 */
 // function handleColumnClick(lotCode) {
@@ -265,21 +514,21 @@ function handleColumnClick(lotCode) {
   // 拼接 URL
   const url = "/reviseBath/lotFormParticulars/" + lotCode;
   // 在新标签页打开 URL
-  window.open(url, '_blank');
+  window.open(url, "_blank");
 }
 function handleChangeTaksStock(value, row, index) {
   if (value == 0) {
-    dataList.value[index].taksStockNum = 0
+    dataList.value[index].taksStockNum = 0;
   }
 }
 function handleChangeTaksStockNum(value, row, index) {
   if (value != 0) {
-    dataList.value[index].isTaksStock = "1"
+    dataList.value[index].isTaksStock = "1";
   }
 }
 function handleCancel(row, index) {
-  dataList.value[index].editStatus = false
-  getList()
+  dataList.value[index].editStatus = false;
+  getList();
 }
 function handleQuery() {
   getList();
@@ -299,20 +548,20 @@ const reset = () => {
     lotCode: "",
     deptId: null,
     flags: null,
-    isTaksStock: null
+    isTaksStock: null,
   };
   dataList.value = [];
 };
 
 function handleExport() {
-  exportNoStartLot({ takeStockPeriodId: queryParams.value.takeStockPeriodId })
+  exportNoStartLot({ takeStockPeriodId: queryParams.value.takeStockPeriodId });
 }
 function handleExportStorage() {
-  exportStorageLot({takeStockPeriodId: queryParams.value.takeStockPeriodId})
+  exportStorageLot({ takeStockPeriodId: queryParams.value.takeStockPeriodId });
 }
 
 function showOutsourceCheckDialog() {
-  outsourceCheckDialogRef.value.open(detailInfo.value)
+  outsourceCheckDialogRef.value.open(detailInfo.value);
 }
 
 /** 暴露给父组件的方法 */

+ 360 - 191
src/views/business/inventoryCheck/index.vue

@@ -1,126 +1,289 @@
 <template>
-    <div class="page-container row-container">
-        <!-- 左侧区域 -->
-        <section class="list-part-container" style="flex: 3">
-            <!-- 搜索区 -->
-            <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true"
-                style="margin-right: 0px">
-                <el-form-item class="section-title" label="盘点" />
-                <el-form-item label="创建时间:">
-                    <el-date-picker v-model="queryParams.createStartTime" type="date" value-format="YYYY-MM-DD"
-                        :editable="false" clearable placeholder="请选择" style="width: 130px" />
-                    <span>到</span>
-                    <el-date-picker v-model="queryParams.createEndTime" type="date" value-format="YYYY-MM-DD"
-                        :editable="false" clearable placeholder="请选择" style="width: 130px" />
-                </el-form-item>
-                <el-form-item label="开始时间:">
-                    <el-date-picker v-model="queryParams.startTimeStr" type="date" value-format="YYYY-MM-DD"
-                        :editable="false" clearable placeholder="请选择" style="width: 130px" />
-                    <span>到</span>
-                    <el-date-picker v-model="queryParams.startTimeEnd" type="date" value-format="YYYY-MM-DD"
-                        :editable="false" clearable placeholder="请选择" style="width: 130px" />
-                </el-form-item>
-                <el-form-item label="结束时间:">
-                    <el-date-picker v-model="queryParams.endTimeStr" type="date" value-format="YYYY-MM-DD"
-                        :editable="false" clearable placeholder="请选择" style="width: 130px" />
-                    <span>到</span>
-                    <el-date-picker v-model="queryParams.endTimeEnd" type="date" value-format="YYYY-MM-DD"
-                        :editable="false" clearable placeholder="请选择" style="width: 130px" />
-                </el-form-item>
-                <el-form-item label="状态:">
-                    <el-select v-model="queryParams.status" clearable placeholder="请选择盘点状态" style="width: 145px">
-                        <el-option v-for="dict in take_stock_status" :key="dict.value" :label="dict.label"
-                            :value="dict.value"></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="备注:">
-                    <el-input placeholder="请输入备注" v-model.trim="queryParams.remark" @keydown.enter.prevent clearable
-                        style="width: 120px" />
-                </el-form-item>
-                <el-form-item style="margin-left: 0">
-                    <el-button type="info" icon="Search" @click="handleQuery">搜索
-                    </el-button>
-                    <el-button v-show="!hasAlreadyAddTakeStock && !hasAlreadyTakeStock"
-                        v-hasPermi="['business:inventoryCheck:add']" type="primary" icon="Plus"
-                        @click="handleAdd">新增</el-button>
-                </el-form-item>
-            </el-form>
-            <div class="el-table-container">
-                <div class="el-table-inner-container">
-                    <el-table ref="takeStockPeriodTable" :data="takeStockPeriodList" v-loading="loading"
-                        highlight-current-row height="100%">
-                        <el-table-column type="index" label="行号" width="50" align="center" />
-                        <el-table-column label="创建时间" prop="createTime" width="200" align="center" />
-                        <el-table-column label="开始时间" prop="startTime" width="200" align="center" />
-                        <el-table-column label="结束时间" prop="endTime" width="200" align="center" />
-                        <el-table-column label="盘点年月" prop="stockTime" width="150" align="center">
-                            <template #default="scope">
-                                <el-date-picker v-if="scope.row.selectDateStatus" v-model="scope.row.stockTime"
-                                    type="month" value-format="YYYY-M" :editable="false" clearable placeholder="请选择"
-                                    style="width: 130px" />
-                                <div v-else>{{ scope.row.stockTime }}</div>
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="盘点状态" prop="status" width="80" align="center">
-                            <template #default="scope">
-                                <dict-tag :options="take_stock_status" :value="scope.row.status" />
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="备注" prop="remark" align="center">
-                            <template #default="scope">
-                                <div v-if="scope.row.editStatus">
-                                    <el-input v-model.trim="scope.row.remark" placeholder="请输入备注" />
-                                </div>
-                                <div v-else>{{ scope.row.remark }}</div>
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="操作" align="center" width="300">
-                            <template #default="scope">
-                                <el-button v-show="!scope.row.editStatus" v-hasPermi="['business:inventoryCheck:edit']"
-                                    link type="warning" icon="Edit" @click="handleUpdate(scope.row)">
-                                    编辑
-                                </el-button>
-                                <el-button
-                                    v-show="!scope.row.editStatus && (scope.row.status == 1 || scope.row.status == 2)"
-                                    v-hasPermi="['business:inventoryCheck:view']" link type="primary" icon="View"
-                                    @click="handleView(scope.row)">
-                                    查看
-                                </el-button>
-                                <el-button v-show="!scope.row.editStatus && scope.row.status == 0"
-                                    v-hasPermi="['business:inventoryCheck:start']" link type="success" icon="Open"
-                                    @click="handleStartTakeStock(scope.row)">
-                                    开始盘点
-                                </el-button>
-                                <el-button v-show="!scope.row.editStatus && scope.row.status == 1" link
-                                    v-hasPermi="['business:inventoryCheck:end']" type="danger" icon="TurnOff"
-                                    @click="handleEndTakeStock(scope.row)">
-                                    结束盘点
-                                </el-button>
-                                <el-button link v-if="scope.row.editStatus" icon="Close" type="danger"
-                                    @click="handleCancel(scope.row, scope.$index)">取消</el-button>
-                                <el-button link icon="Check" v-if="scope.row.editStatus" type="success"
-                                    @click="handleSave(scope.row)">保存</el-button>
-                                <el-button v-if="scope.row.status == 2"
-                                    v-hasPermi="['business:inventoryCheck:downLoad']" link type="primary"
-                                    icon="Download" @click="handleExport(scope.row)">导出
-                                </el-button>
-                            </template>
-                        </el-table-column>
-                    </el-table>
+  <div class="page-container row-container">
+    <!-- 左侧区域 -->
+    <section class="list-part-container" style="flex: 3">
+      <!-- 搜索区 -->
+      <el-form
+        class="list-search-container"
+        :model="queryParams"
+        ref="queryRef"
+        :inline="true"
+        style="margin-right: 0px"
+      >
+        <el-form-item class="section-title" label="盘点" />
+        <el-form-item label="创建时间:">
+          <el-date-picker
+            v-model="queryParams.createStartTime"
+            type="date"
+            value-format="YYYY-MM-DD"
+            :editable="false"
+            clearable
+            placeholder="请选择"
+            style="width: 130px"
+          />
+          <span>到</span>
+          <el-date-picker
+            v-model="queryParams.createEndTime"
+            type="date"
+            value-format="YYYY-MM-DD"
+            :editable="false"
+            clearable
+            placeholder="请选择"
+            style="width: 130px"
+          />
+        </el-form-item>
+        <el-form-item label="开始时间:">
+          <el-date-picker
+            v-model="queryParams.startTimeStr"
+            type="date"
+            value-format="YYYY-MM-DD"
+            :editable="false"
+            clearable
+            placeholder="请选择"
+            style="width: 130px"
+          />
+          <span>到</span>
+          <el-date-picker
+            v-model="queryParams.startTimeEnd"
+            type="date"
+            value-format="YYYY-MM-DD"
+            :editable="false"
+            clearable
+            placeholder="请选择"
+            style="width: 130px"
+          />
+        </el-form-item>
+        <el-form-item label="结束时间:">
+          <el-date-picker
+            v-model="queryParams.endTimeStr"
+            type="date"
+            value-format="YYYY-MM-DD"
+            :editable="false"
+            clearable
+            placeholder="请选择"
+            style="width: 130px"
+          />
+          <span>到</span>
+          <el-date-picker
+            v-model="queryParams.endTimeEnd"
+            type="date"
+            value-format="YYYY-MM-DD"
+            :editable="false"
+            clearable
+            placeholder="请选择"
+            style="width: 130px"
+          />
+        </el-form-item>
+        <el-form-item label="状态:">
+          <el-select
+            v-model="queryParams.status"
+            clearable
+            placeholder="请选择盘点状态"
+            style="width: 145px"
+          >
+            <el-option
+              v-for="dict in take_stock_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注:">
+          <el-input
+            placeholder="请输入备注"
+            v-model.trim="queryParams.remark"
+            @keydown.enter.prevent
+            clearable
+            style="width: 120px"
+          />
+        </el-form-item>
+        <el-form-item style="margin-left: 0">
+          <el-button type="info" icon="Search" @click="handleQuery"
+            >搜索
+          </el-button>
+          <el-button
+            v-show="!hasAlreadyAddTakeStock && !hasAlreadyTakeStock"
+            v-hasPermi="['business:inventoryCheck:add']"
+            type="primary"
+            icon="Plus"
+            @click="handleAdd"
+            >新增</el-button
+          >
+        </el-form-item>
+      </el-form>
+      <div class="el-table-container">
+        <div class="el-table-inner-container">
+          <el-table
+            ref="takeStockPeriodTable"
+            :data="takeStockPeriodList"
+            v-loading="loading"
+            highlight-current-row
+            height="100%"
+          >
+            <el-table-column
+              type="index"
+              label="行号"
+              width="50"
+              align="center"
+            />
+            <el-table-column
+              label="创建时间"
+              prop="createTime"
+              width="200"
+              align="center"
+            />
+            <el-table-column
+              label="开始时间"
+              prop="startTime"
+              width="200"
+              align="center"
+            />
+            <el-table-column
+              label="结束时间"
+              prop="endTime"
+              width="200"
+              align="center"
+            />
+            <el-table-column
+              label="盘点年月"
+              prop="stockTime"
+              width="150"
+              align="center"
+            >
+              <template #default="scope">
+                <el-date-picker
+                  v-if="scope.row.selectDateStatus"
+                  v-model="scope.row.stockTime"
+                  type="month"
+                  value-format="YYYY-M"
+                  :editable="false"
+                  clearable
+                  placeholder="请选择"
+                  style="width: 130px"
+                />
+                <div v-else>{{ scope.row.stockTime }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="盘点状态"
+              prop="status"
+              width="80"
+              align="center"
+            >
+              <template #default="scope">
+                <dict-tag
+                  :options="take_stock_status"
+                  :value="scope.row.status"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" prop="remark" align="center">
+              <template #default="scope">
+                <div v-if="scope.row.editStatus">
+                  <el-input
+                    v-model.trim="scope.row.remark"
+                    placeholder="请输入备注"
+                  />
                 </div>
-            </div>
-            <!-- 分页 -->
-            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-                v-model:limit="queryParams.pageSize" @pagination="getTakeStockPeriodList" />
-        </section>
-        <!-- 盘点详情 -->
-        <inventory-check-form ref="inventoryCheckFormRef" />
-
-    </div>
+                <div v-else>{{ scope.row.remark }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="300">
+              <template #default="scope">
+                <el-button
+                  v-show="!scope.row.editStatus"
+                  v-hasPermi="['business:inventoryCheck:edit']"
+                  link
+                  type="warning"
+                  icon="Edit"
+                  @click="handleUpdate(scope.row)"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-show="
+                    !scope.row.editStatus &&
+                    (scope.row.status == 1 || scope.row.status == 2)
+                  "
+                  v-hasPermi="['business:inventoryCheck:view']"
+                  link
+                  type="primary"
+                  icon="View"
+                  @click="handleView(scope.row)"
+                >
+                  查看
+                </el-button>
+                <el-button
+                  v-show="!scope.row.editStatus && scope.row.status == 0"
+                  v-hasPermi="['business:inventoryCheck:start']"
+                  link
+                  type="success"
+                  icon="Open"
+                  @click="handleStartTakeStock(scope.row)"
+                >
+                  开始盘点
+                </el-button>
+                <el-button
+                  v-show="!scope.row.editStatus && scope.row.status == 1"
+                  link
+                  v-hasPermi="['business:inventoryCheck:end']"
+                  type="danger"
+                  icon="TurnOff"
+                  @click="handleEndTakeStock(scope.row)"
+                >
+                  结束盘点
+                </el-button>
+                <el-button
+                  link
+                  v-if="scope.row.editStatus"
+                  icon="Close"
+                  type="danger"
+                  @click="handleCancel(scope.row, scope.$index)"
+                  >取消</el-button
+                >
+                <el-button
+                  link
+                  icon="Check"
+                  v-if="scope.row.editStatus"
+                  type="success"
+                  @click="handleSave(scope.row)"
+                  >保存</el-button
+                >
+                <el-button
+                  v-if="scope.row.status == 2"
+                  v-hasPermi="['business:inventoryCheck:downLoad']"
+                  link
+                  type="primary"
+                  icon="Download"
+                  @click="handleExport(scope.row)"
+                  >导出
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+      <!-- 分页 -->
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getTakeStockPeriodList"
+      />
+    </section>
+    <!-- 盘点详情 -->
+    <inventory-check-form ref="inventoryCheckFormRef" />
+  </div>
 </template>
 
 <script setup name="inventoryCheck">
-import { listTakeStockPeriod, addTakeStockPeriod, updateTakeStockPeriod } from "@/api/business/takeStockPeriod";
+import {
+  listTakeStockPeriod,
+  addTakeStockPeriod,
+  updateTakeStockPeriod,
+} from "@/api/business/takeStockPeriod";
 
 import inventoryCheckForm from "./form.vue";
 import { ref } from "vue";
@@ -130,7 +293,7 @@ const { take_stock_status } = proxy.useDict("take_stock_status");
 
 /** 盘点 */
 const takeStockPeriodTable = ref(null);
-const takeStockPeriodList = ref([])
+const takeStockPeriodList = ref([]);
 //列表中是否已经存在开始盘点的数据
 const hasAlreadyTakeStock = ref(false);
 //列表中已经存在新增的盘点
@@ -139,114 +302,120 @@ const loading = ref(false);
 const total = ref(0);
 
 const queryParams = ref({
-    status: null,
-    createStartTime: null,
-    createEndTime: null,
-    startTimeStr: null,
-    startTimeEnd: null,
-    endTimeStr: null,
-    endTimeEnd: null,
-    remark: null,
-    pageNum: 1,
-    pageSize: 10,
+  status: null,
+  createStartTime: null,
+  createEndTime: null,
+  startTimeStr: null,
+  startTimeEnd: null,
+  endTimeStr: null,
+  endTimeEnd: null,
+  remark: null,
+  pageNum: 1,
+  pageSize: 10,
 });
 
 /***********************  工段相关事件  ****************************/
 
 function getTakeStockPeriodList() {
-    loading.value = true;
-    listTakeStockPeriod(queryParams.value).then(res => {
-        takeStockPeriodList.value = res.rows;
-        hasAlreadyTakeStock.value = res.others.hasAddTakeStockStatus
-        hasAlreadyAddTakeStock.value = res.others.hasTakeStockStatus
-        total.value = res.total;
-    })
-    loading.value = false
+  loading.value = true;
+  listTakeStockPeriod(queryParams.value).then((res) => {
+    takeStockPeriodList.value = res.rows;
+    hasAlreadyTakeStock.value = res.others.hasAddTakeStockStatus;
+    hasAlreadyAddTakeStock.value = res.others.hasTakeStockStatus;
+    total.value = res.total;
+  });
+  loading.value = false;
 }
 //新增
 function handleAdd() {
-    takeStockPeriodList.value.unshift({ createTime: proxy.moment().format("YYYY-MM-DD HH:mm:ss"), startTime: null, stockTime: null, endTime: null, status: "0", remark: null, editStatus: true, selectDateStatus: true })
-    hasAlreadyAddTakeStock.value = true
+  takeStockPeriodList.value.unshift({
+    createTime: proxy.moment().format("YYYY-MM-DD HH:mm:ss"),
+    startTime: null,
+    stockTime: null,
+    endTime: null,
+    status: "0",
+    remark: null,
+    editStatus: true,
+    selectDateStatus: true,
+  });
+  hasAlreadyAddTakeStock.value = true;
 }
 //保存按钮
 function handleSave(row) {
-    if (row.stockTime == null) {
-        proxy.$modal.msgError("请选择盘点时间")
-        return
+  if (row.stockTime == null) {
+    proxy.$modal.msgError("请选择盘点时间");
+    return;
+  }
+  row.stockYear = row.stockTime.substring(0, 4);
+  row.stockMonth = row.stockTime.substring(5, 7);
+  console.log(row);
+  addTakeStockPeriod(row).then((res) => {
+    if (res.code === 200) {
+      getTakeStockPeriodList();
     }
-    row.stockYear = row.stockTime.substring(0, 4)
-    row.stockMonth = row.stockTime.substring(5, 7)
-    console.log(row)
-    addTakeStockPeriod(row).then(res => {
-        if (res.code === 200) {
-            getTakeStockPeriodList()
-        }
-    })
+  });
 }
 function handleExport(data) {
-    console.log(data)
-    proxy.download('/ezhizao-dms-production/business/taksStockLot/download', {
-        id: data.id
-    }, `盘点汇总${new Date().getTime()}.xlsx`)
+  console.log(data);
+  proxy.download(
+    "/ezhizao-dms-production/business/taksStockLot/download",
+    {
+      id: data.id,
+    },
+    `盘点汇总${new Date().getTime()}.xlsx`
+  );
 }
 //查看按钮
 function handleView(row) {
-    proxy.$refs.inventoryCheckFormRef.open(row);
+  proxy.$refs.inventoryCheckFormRef.open(row);
 }
 //结束盘点
 function handleEndTakeStock(row) {
-    proxy.$modal
-        .confirm("是否确认结束盘点?")
-        .then(function () {
-            row.endTime = proxy.moment().format("YYYY-MM-DD HH:mm:ss")
-            row.status = 2
-            updateTakeStockPeriod(row).then(res => {
-                if (res.code === 200) {
-                    proxy.$modal.msgSuccess("已成功结束盘点");
-                    getTakeStockPeriodList()
-                }
-            })
-        })
+  proxy.$modal.confirm("是否确认结束盘点?").then(function () {
+    row.endTime = proxy.moment().format("YYYY-MM-DD HH:mm:ss");
+    row.status = 2;
+    updateTakeStockPeriod(row).then((res) => {
+      if (res.code === 200) {
+        proxy.$modal.msgSuccess("已成功结束盘点");
+        getTakeStockPeriodList();
+      }
+    });
+  });
 }
 //编辑按钮
 function handleUpdate(row) {
-    row.editStatus = true
+  row.editStatus = true;
 }
 //开始盘点
 function handleStartTakeStock(row) {
-    proxy.$modal
-        .confirm("是否确认开始盘点?")
-        .then(function () {
-            row.startTime = proxy.moment().format("YYYY-MM-DD HH:mm:ss")
-            row.flag = 0
-            updateTakeStockPeriod(row).then(res => {
-                if (res.code === 200) {
-                    proxy.$modal.msgSuccess("已成功开始盘点");
-                    getTakeStockPeriodList()
-                }
-            })
-        })
-
+  proxy.$modal.confirm("是否确认开始盘点?").then(function () {
+    loading.value = true;
+    row.startTime = proxy.moment().format("YYYY-MM-DD HH:mm:ss");
+    row.flag = 0;
+    updateTakeStockPeriod(row).then((res) => {
+      if (res.code === 200) {
+        proxy.$modal.msgSuccess("已成功开始盘点");
+        getTakeStockPeriodList();
+      }
+    });
+  });
 }
 /** 搜索按钮操作 */
 function handleQuery() {
-    getTakeStockPeriodList();
+  getTakeStockPeriodList();
 }
 function handleCancel(row, index) {
-    if (row.id) {
-        takeStockPeriodList.value[index].editStatus = false
-    }
-    getTakeStockPeriodList()
-
-
-
+  if (row.id) {
+    takeStockPeriodList.value[index].editStatus = false;
+  }
+  getTakeStockPeriodList();
 }
 onMounted(() => {
-    getTakeStockPeriodList();
+  getTakeStockPeriodList();
 });
 </script>
 <style scoped>
 .el-form--inline .el-form-item {
-    margin-right: 20px;
+  margin-right: 20px;
 }
 </style>