1

src/assets/styles/index.scss

@@ -193,7 +193,7 @@ aside {
   z-index: 1000 !important;
 }
 
-.commons-title{
+.commons-title {
   font-size: 14px;
   font-weight: bold;
   margin-bottom: 20px;
@@ -201,7 +201,7 @@ aside {
   position: relative;
 }
 
-.commons-title::before{
+.commons-title::before {
   content: '';
   display: inline-block;
   width: 4px;
@@ -210,10 +210,10 @@ aside {
   margin-right: 10px;
   position: absolute;
   left: 0;
-  top:3px;
+  top: 3px;
 }
 
-.cp{
+.cp {
   cursor: pointer;
 }
 
@@ -224,8 +224,35 @@ aside {
 }
 
 .icon {
-  width: 1em; height: 1em;
+  width: 1em;
+  height: 1em;
   vertical-align: -0.15em;
   fill: currentColor;
   overflow: hidden;
+}
+
+::-webkit-scrollbar {
+  /* 垂直滚动条宽度 */
+  width: 8px !important;
+  /* 水平滚动条高度 */
+  height: 8px !important;
+}
+
+/* 轨道 */
+::-webkit-scrollbar-track {
+  border-radius: 10px !important;
+  background: #ebe9e9;
+}
+
+/* 滑块 */
+::-webkit-scrollbar-thumb {
+  border-radius: 10px !important;
+  background-color: rgb(206, 206, 206) !important;
+}
+
+/* 鼠标悬停在滑块上的样式 */
+::-webkit-scrollbar-thumb:hover {
+  border-radius: 10px !important;
+  background-color: rgb(192, 192, 192) !important;
+  /* 悬停时的滑块背景色 */
 }

src/components/process/SendPurchase.vue

@@ -87,10 +87,13 @@
             </template>
           </el-table-column>
           <el-table-column prop="amount" label="金额" />
-          <el-table-column prop="zip" label="操作" width="100">
-            <template #default="{ $index }">
+          <el-table-column prop="zip" label="操作" width="120">
+            <template #default="{ row,$index }">
               <el-button type="primary" link @click="handleRemove($index, 20)"
                          :disabled="formData.data.purchaseDetailList.length === 1">删除</el-button>
+              <span style="color:#409eff;cursor:pointer;margin-left:15px" v-if="route.query && route.query.processType==20"
+                    @click="handlePrintOne(row)">打码</span>
+
             </template>
           </el-table-column>
         </el-table>
@@ -159,6 +162,32 @@
     <el-dialog v-if="openProduct" v-model="openProduct" title="选择货品" width="70%" append-to-body>
       <SelectGoods :selectList="acquireSelectList()" @cancel="openProduct = false" @pushGoods="pushGoods"></SelectGoods>
     </el-dialog>
+
+    <el-dialog title="打印二维码" v-if="printDialogOne" v-model="printDialogOne" width="400">
+      <div style=" padding-right: 20px">
+        <div id="pdfDom" style="width:100%">
+          <div v-for="(item,index) in qrList" :key="index"
+               style="border: 1px solid #000; padding: 10px; margin:0 auto;margin-bottom: 20px;display:flex">
+            <div :ref="item.scanValue">
+              {{item.scanValue}}
+            </div>
+            <div style="margin-left:10px;display:flex;flex-direction:column;justify-content:space-around">
+              <div> 产品名称：{{item.productName}}</div>
+              <div>
+                规格型号：{{item.productSpec}}
+              </div>
+            </div>
+            <!-- 换页 -->
+            <div style="page-break-after: always"></div>
+          </div>
+        </div>
+      </div>
+
+      <template #footer>
+        <el-button @click="printDialogOne = false" size="large">取 消</el-button>
+        <el-button type="primary" v-print="printObj" size="large">打 印</el-button>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -167,6 +196,7 @@ import SelectGoods from "@/components/product/SelectGoods";
 import { ElMessage, ElMessageBox } from "element-plus";
 import useUserStore from "@/store/modules/user";
 import { onActivated } from "vue";
+import QRCode from "qrcodejs2-fix";
 
 const route = useRoute();
 const { proxy } = getCurrentInstance();
@@ -797,6 +827,45 @@ const acquireSelectList = () => {
   }
   return data;
 };
+
+const printObj = ref({
+  id: "pdfDom",
+  popTitle: "",
+  extraCss:
+    "https://cdn.bootcdn.net/ajax/libs/animate.css/4.1.1/animate.compat.css, https://cdn.bootcdn.net/ajax/libs/hover.css/2.3.1/css/hover-min.css",
+  extraHead: '<meta http-equiv="Content-Language"content="zh-cn"/>',
+});
+
+const printDialogOne = ref(false);
+const qrList = ref([]);
+const handlePrintOne = (row) => {
+  const { id } = row;
+  const arr = [];
+  for (let i = 0; i < 1; i++) {
+    let obj = {
+      productName: row.productName,
+      productSpec: row.productSpec,
+      scanValue: id,
+    };
+    arr.push(obj);
+  }
+  qrList.value = arr;
+  printDialogOne.value = true;
+  nextTick(() => {
+    for (let i = 0; i < qrList.value.length; i++) {
+      const ele = qrList.value[i];
+      proxy.$refs[ele.scanValue][0].innerHTML = ""; //清除二维码方法一
+      new QRCode(proxy.$refs[ele.scanValue][0], {
+        text: ele.scanValue,
+        width: 100,
+        height: 100,
+        colorDark: "#000000",
+        colorLight: "#ffffff",
+        correctLevel: QRCode.CorrectLevel.H,
+      });
+    }
+  });
+};
 </script>
 
 <style lang="scss" scoped>

src/components/product/SelectGoods.vue

@@ -1,39 +1,25 @@
 <template>
   <div>
-    <byTable
-      ref="table"
-      :tableHeight="tableHeight"
-      :source="sourceList.data"
-      :pagination="sourceList.pagination"
-      :config="config"
-      :loading="loading"
-      highlight-current-row
-      :selectConfig="selectConfig"
-      :action-list="[]"
-      @get-list="getList"
-    >
+    <byTable ref="table" :tableHeight="tableHeight" :source="sourceList.data" :pagination="sourceList.pagination" :config="config" :loading="loading"
+             highlight-current-row :selectConfig="selectConfig" :action-list="[]" @get-list="getList">
     </byTable>
-    <div>
+    <div style="text-align: center">
+      <el-button @click="handleCancel" size="large">取 消</el-button>
+      <!-- <el-button type="primary" @click="handleSubmit" size="large">确 定</el-button> -->
+    </div>
+    <!-- <div>
       <div>已选择货品</div>
       <div style="margin: 10px 0px">
-        <el-tag
-          style="margin-right: 10px; margin-bottom: 5px"
-          type="info"
-          closable
-          v-for="(good, index) in goodList"
-          :key="good.id"
-          @close="handleRemove(index)"
-        >
+        <el-tag style="margin-right: 10px; margin-bottom: 5px" type="info" closable v-for="(good, index) in goodList" :key="good.id"
+                @close="handleRemove(index)">
           {{ good.name }}
         </el-tag>
       </div>
       <div style="text-align: center">
         <el-button @click="handleCancel" size="large">取 消</el-button>
-        <el-button type="primary" @click="handleSubmit" size="large"
-          >确 定</el-button
-        >
+        <el-button type="primary" @click="handleSubmit" size="large">确 定</el-button>
       </div>
-    </div>
+    </div> -->
   </div>
 </template>
 
@@ -209,23 +195,24 @@ const props = defineProps({
 });
 const goodList = ref([]);
 onMounted(() => {
-  goodList.value = proxy.deepClone(props.selectList);
+  // goodList.value = proxy.deepClone(props.selectList);
 });
 const handleSelect = (row) => {
-  const flag = goodList.value.some((x) => x.id === row.id);
-  if (flag)
-    return ElMessage({
-      message: "该产品已选择",
-      type: "info",
-    });
+  // const flag = goodList.value.some((x) => x.id === row.id);
+  // if (flag)
+  //   return ElMessage({
+  //     message: "该产品已选择",
+  //     type: "info",
+  //   });
   goodList.value.push({
     ...row,
     goodType: sourceList.value.pagination.definition,
   });
-  return ElMessage({
-    message: "选择成功",
-    type: "success",
-  });
+  proxy.$emit("pushGoods", goodList.value);
+  // return ElMessage({
+  //   message: "选择成功",
+  //   type: "success",
+  // });
 };
 const handleRemove = (index) => {
   goodList.value.splice(index, 1);

src/views/JXSK/salesMange/contract/index.vue

@@ -197,9 +197,13 @@
       </byForm>
       <template #footer>
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
-        <el-button type="primary" @click="submitForm()" size="large" :loading="submitLoading" v-if="modalType == 'add'">
+        <el-button type="primary" @click="submitForm(10)" size="large" :loading="submitLoading" v-if="modalType == 'add'">
+
+          暂 存 </el-button>
+        <el-button type="primary" @click="submitForm(20)" size="large" :loading="submitLoading" v-if="modalType == 'add'">
           确 定
         </el-button>
+
       </template>
     </el-dialog>
 
@@ -260,6 +264,9 @@ const rules = ref({
   customerId: [
     { required: true, message: "请选择客户名称", trigger: "change" },
   ],
+  devUserId: [
+    { required: true, message: "请选择研发负责人", trigger: "change" },
+  ],
   shroffAccountId: [
     { required: true, message: "请选择收款账户", trigger: "change" },
   ],
@@ -382,9 +389,8 @@ const config = computed(() => {
       },
       renderHTML(row) {
         return [
-          row.isSettled == "1"
-            ? {}
-            : {
+          row.isSettled == "0" && row.flowStatus != 0
+            ? {
                 attrs: {
                   label: "结清",
                   type: "primary",
@@ -410,18 +416,21 @@ const config = computed(() => {
                       });
                   });
                 },
-              },
-          // {
-          //   attrs: {
-          //     label: "查看",
-          //     type: "primary",
-          //     text: true,
-          //   },
-          //   el: "button",
-          //   click() {
-          //     getDtl(row);
-          //   },
-          // },
+              }
+            : {},
+          row.flowStatus == 0
+            ? {
+                attrs: {
+                  label: "修改",
+                  type: "primary",
+                  text: true,
+                },
+                el: "button",
+                click() {
+                  getDtlOne(row);
+                },
+              }
+            : {},
           {
             attrs: {
               label: "打印",
@@ -541,6 +550,17 @@ const formConfig = computed(() => {
       slotName: "products",
       label: "合同明细",
     },
+    {
+      type: "select",
+      prop: "devUserId",
+      label: "研发负责人",
+      required: true,
+      filterable: true,
+      data: devUserList.value,
+      style: {
+        width: "100%",
+      },
+    },
   ];
 });
 const getList = async (req) => {
@@ -565,7 +585,7 @@ const openModal = () => {
   };
 };
 
-const submitForm = () => {
+const submitForm = (type) => {
   byform.value.handleSubmit(() => {
     if (!formData.data.salesContractDetailsList.length > 0) {
       return ElMessage({
@@ -573,16 +593,12 @@ const submitForm = () => {
         type: "info",
       });
     }
-    submitLoading.value = true;
-    proxy
-      .post("/flowProcess/initiate", {
-        flowKey: "jxst_sales_contract_flow",
-        data: formData.data,
-      })
-      .then(
+    if (type == 10) {
+      submitLoading.value = true;
+      proxy.post("/salesContract/add", formData.data).then(
         () => {
           ElMessage({
-            message: "添加成功",
+            message: "暂存成功",
             type: "success",
           });
           dialogVisible.value = false;
@@ -591,9 +607,31 @@ const submitForm = () => {
         },
         (err) => {
           console.log(err);
-          submitLoading.value = false;
         }
       );
+    } else {
+      submitLoading.value = true;
+      proxy
+        .post("/flowProcess/initiate", {
+          flowKey: "jxst_sales_contract_flow",
+          data: formData.data,
+        })
+        .then(
+          () => {
+            ElMessage({
+              message: "添加成功",
+              type: "success",
+            });
+            dialogVisible.value = false;
+            submitLoading.value = false;
+            getList();
+          },
+          (err) => {
+            console.log(err);
+            submitLoading.value = false;
+          }
+        );
+    }
   });
 };
 const getDtl = (row) => {
@@ -610,8 +648,23 @@ const getDtl = (row) => {
     dialogVisible.value = true;
   });
 };
+const getDtlOne = (row) => {
+  modalType.value = "add";
+  formOption.disabled = false;
+  proxy.post("/salesContract/detail", { id: row.id }).then((res) => {
+    if (res && res.contractDetailsList.length > 0) {
+      res.salesContractDetailsList = res.contractDetailsList;
+    } else {
+      res.salesContractDetailsList = [];
+    }
+    formData.data = res;
+    changeAmount();
+    dialogVisible.value = true;
+  });
+};
 
 const customerData = ref([]);
+const devUserList = ref([]);
 const accountList = ref([]);
 const corporationList = ref([]);
 const payMethodData = ref([]);
@@ -632,6 +685,23 @@ const getDict = () => {
       value: x.id,
     }));
   });
+
+  proxy
+    .post("/system/user/getUserList", {
+      pageNum: 1,
+      pageSize: 9999,
+      roleKey: "dev",
+    })
+    .then((res) => {
+      devUserList.value = res.map((item) => {
+        return {
+          ...item,
+          label: item.nickName,
+          value: item.userId,
+        };
+      });
+    });
+
   proxy
     .post("/accountManagement/page", { pageNum: 1, pageSize: 999 })
     .then((res) => {
@@ -653,6 +723,7 @@ const getDict = () => {
       };
     });
   });
+
   proxy.getDict(["funds_payment_method"]).then((res) => {
     payMethodData.value = res["funds_payment_method"].map((x) => ({
       label: x.dictValue,

src/views/process/processApproval/index.vue

@@ -708,6 +708,12 @@ onMounted(async () => {
         .then((res) => {
           queryData.data = { ...res };
         });
+    } else if (route.query.flowKey == "purchase_flow") {
+      await proxy
+        .post("/purchase/detail", { id: route.query.businessId })
+        .then((res) => {
+          queryData.data = { ...res };
+        });
     } else {
       await proxy
         .post("/flowProcess/getStartData", { flowId: route.query.id })

src/views/product/material/index.vue

@@ -281,19 +281,19 @@ const config = computed(() => {
                   });
                 },
               },
-          props.selectStatus
-            ? {}
-            : {
-                attrs: {
-                  label: "查看二维码",
-                  type: "primary",
-                  text: true,
-                },
-                el: "button",
-                click() {
-                  handlePrint(row);
-                },
-              },
+          // props.selectStatus
+          //   ? {}
+          //   : {
+          //       attrs: {
+          //         label: "查看二维码",
+          //         type: "primary",
+          //         text: true,
+          //       },
+          //       el: "button",
+          //       click() {
+          //         handlePrint(row);
+          //       },
+          //     },
         ];
       },
     },

src/views/purchaseManage/purchaseManage/alreadyPurchase/index.vue

@@ -2,70 +2,35 @@
   <div class="tenant">
     <!-- <Banner /> -->
     <div class="content">
-      <byTable
-        :source="sourceList.data"
-        :pagination="sourceList.pagination"
-        :config="config"
-        :loading="loading"
-        highlight-current-row
-        :statConfig="statConfig"
-        :selectConfig="selectConfig"
-        :table-events="{
+      <byTable :source="sourceList.data" :pagination="sourceList.pagination" :config="config" :loading="loading" highlight-current-row
+               :statConfig="statConfig" :selectConfig="selectConfig" :table-events="{
           //element talbe事件都能传
-        }"
-        :action-list="[
+        }" :action-list="[
           {
             text: '新增采购',
             action: () => start(),
           },
-        ]"
-        @get-list="getList"
-      >
+        ]" @get-list="getList">
         <template #code="{ item }">
-          <div
-            style="cursor: pointer; color: #409eff"
-            @click="handleClickCode(item)"
-          >
+          <div style="cursor: pointer; color: #409eff" @click="handleClickCode(item)">
             {{ item.code }}
           </div>
         </template>
         <template #contractCode="{ item }">
-          <div
-            style="cursor: pointer; color: #409eff"
-            @click="handleClickcontractCode(item)"
-          >
+          <div style="cursor: pointer; color: #409eff" @click="handleClickcontractCode(item)">
             {{ item.contractCode }}
           </div>
         </template>
       </byTable>
     </div>
-    <el-dialog
-      title="到货通知"
-      v-model="dialogVisible"
-      width="800"
-      v-loading="loading"
-    >
-      <el-form
-        :model="formData.data"
-        :rules="rules"
-        ref="formDom"
-        label-position="top"
-      >
+    <el-dialog title="到货通知" v-model="dialogVisible" width="800" v-loading="loading">
+      <el-form :model="formData.data" :rules="rules" ref="formDom" label-position="top">
         <div style="margin-bottom: 10px; font-size: 14px">基础信息</div>
         <el-row>
           <el-col :span="8">
             <el-form-item label="供应商" prop="supplyId">
-              <el-select
-                v-model="formData.data.supplyId"
-                placeholder="请选择"
-                style="width: 100%"
-                disabled
-              >
-                <el-option
-                  v-for="item in supplierData"
-                  :label="item.name"
-                  :value="item.id"
-                >
+              <el-select v-model="formData.data.supplyId" placeholder="请选择" style="width: 100%" disabled>
+                <el-option v-for="item in supplierData" :label="item.name" :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -74,11 +39,7 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="采购单号" prop="code">
-              <el-input
-                v-model="formData.data.code"
-                placeholder="请输入"
-                disabled
-              >
+              <el-input v-model="formData.data.code" placeholder="请输入" disabled>
               </el-input>
             </el-form-item>
           </el-col>
@@ -87,42 +48,24 @@
         <div style="margin-bottom: 10px; font-size: 14px">到货明细</div>
         <el-form-item>
           <el-table :data="formData.data.arrivalDetailList">
-            <el-table-column
-              prop="productDefinition"
-              label="货品类型"
-              :formatter="
+            <el-table-column prop="productDefinition" label="货品类型" :formatter="
                 (row) => (row.productDefinition == 1 ? '产品' : '物料')
-              "
-            />
+              " />
             <el-table-column prop="productCode" label="货品编码" />
             <el-table-column prop="productName" label="货品名称" />
             <el-table-column prop="productSpec" label="规格型号" />
-            <el-table-column
-              prop="productUnit"
-              label="单位"
-              :formatter="
+            <el-table-column prop="productUnit" label="单位" :formatter="
                 (row) =>
                   row.productDefinition == 1
                     ? dictValueLabel(row.productUnit, productUnit)
                     : dictValueLabel(row.productUnit, productUnitOne)
-              "
-            />
+              " />
             <el-table-column prop="purchaseCount" label="采购数量" />
             <el-table-column prop="sumArrivalCount" label="已到货" />
             <el-table-column prop="count" label="本次到货" min-width="150">
               <template #default="{ row, $index }">
-                <el-form-item
-                  :prop="'arrivalDetailList.' + $index + '.count'"
-                  :rules="rules.count"
-                  :inline-message="true"
-                >
-                  <el-input-number
-                    v-model="row.count"
-                    :precision="2"
-                    :controls="false"
-                    :min="0"
-                    @change="handleChangeAmount"
-                  />
+                <el-form-item :prop="'arrivalDetailList.' + $index + '.count'" :rules="rules.count" :inline-message="true">
+                  <el-input-number v-model="row.count" :precision="2" :controls="false" :min="0" @change="handleChangeAmount" />
                 </el-form-item>
               </template>
             </el-table-column>
@@ -132,12 +75,7 @@
 
       <template #footer>
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
-        <el-button
-          type="primary"
-          @click="submitForm()"
-          size="large"
-          :loading="submitLoading"
-        >
+        <el-button type="primary" @click="submitForm()" size="large" :loading="submitLoading">
           确 定
         </el-button>
       </template>
@@ -328,12 +266,8 @@
       <PurchasePDF :rowData="rowData"></PurchasePDF>
       <template #footer ref="printBtn">
         <el-button @click="openPdf = false" size="large">关闭</el-button>
-        <el-button type="primary" v-print="printObj" size="large"
-          >打印</el-button
-        >
-        <el-button type="primary" @click="clickDownload()" size="large"
-          >下载PDF</el-button
-        >
+        <el-button type="primary" v-print="printObj" size="large">打印</el-button>
+        <el-button type="primary" @click="clickDownload()" size="large">下载PDF</el-button>
       </template>
     </el-dialog>
   </div>
@@ -897,6 +831,7 @@ const handleClickCode = (row) => {
     query: {
       flowKey: row.processInstanceId,
       id: row.flowId,
+      businessId: row.id,
       processType: 20,
     },
   });

src/views/purchaseSales/outAndInWarehouse/inventoryInquiry/index.vue

@@ -30,7 +30,10 @@
           </div>
         </template>
       </byTable>
-      <div v-if="goodList && goodList.length > 0">
+      <div style="text-align: center" v-if="selectStatus">
+        <el-button @click="handleCancel" size="large">取消</el-button>
+      </div>
+      <!-- <div v-if="goodList && goodList.length > 0">
         <div>已选择货品</div>
         <div style="margin: 10px 0px">
           <el-tag style="margin-right: 10px" type="info" closable v-for="(good, index) in goodList" :key="good.id"
@@ -42,7 +45,7 @@
             确 定
           </el-button>
         </div>
-      </div>
+      </div> -->
     </div>
   </div>
 </template>
@@ -288,21 +291,18 @@ const deriveExcel = () => {
 // };
 const goodList = ref([]);
 const clickSelect = (row) => {
-  const flag = goodList.value.some((x) => x.id === row.id);
-  if (flag)
-    return ElMessage({
-      message: "该物品已选择",
-      type: "info",
-    });
+  // const flag = goodList.value.some((x) => x.id === row.id);
+  // if (flag)
+  //   return ElMessage({
+  //     message: "该物品已选择",
+  //     type: "info",
+  //   });
   goodList.value.push({
     ...row,
     goodType: sourceList.value.pagination.definition,
   });
-  return ElMessage({
-    message: "选择成功",
-    type: "success",
-  });
-  proxy.$emit("select", item);
+  proxy.$emit("select", goodList.value);
+  goodList.value = [];
 };
 const handleRemove = (index) => {
   goodList.value.splice(index, 1);

src/views/purchaseSales/outAndInWarehouse/manualDelivery/index.vue

@@ -325,7 +325,7 @@ const pushGoods = (goods) => {
     purchaseDetailId: "",
   }));
   formData.data.list = formData.data.list.concat(arr);
-  openProduct.value = false;
+  // openProduct.value = false;
   return ElMessage({
     message: "添加成功！",
     type: "success",
@@ -397,7 +397,7 @@ const btnTitle = ref("扫码出库");
 const scanInput = ref(null);
 const handleClickScan = () => {
   isScan.value = !isScan.value;
-  btnTitle.value = isScan.value ? "取消扫码" : "扫码出库";
+  btnTitle.value = isScan.value ? "扫码中···" : "扫码出库";
   if (isScan.value) {
     scanInput.value.focus();
   }
@@ -451,7 +451,7 @@ const handleScanValueChange = (val) => {
     top: 50%;
     left: 50%;
     transform: translate(-50%, -50%);
-    font-size: 20px;
+    font-size: 30px;
     font-weight: 700;
     color: #5df5e9;
     cursor: pointer;

src/views/purchaseSales/outAndInWarehouse/manualWarehousing/index.vue

@@ -78,7 +78,7 @@
     </el-dialog>
 
     <el-dialog v-if="openProduct" v-model="openProduct" title="选择商品" width="70%" append-to-body>
-      <SelectGoods :selectList="acquireSelectList()" @cancel="openProduct = false" @pushGoods="pushGoods"></SelectGoods>
+      <SelectGoods @cancel="openProduct = false" @pushGoods="pushGoods"></SelectGoods>
     </el-dialog>
 
     <el-dialog v-model="openOrder" title="工单选择" width="80%" append-to-body destroy-on-close>
@@ -273,6 +273,7 @@ const formConfig = computed(() => {
 });
 const rules = ref({
   warehouseId: [{ required: true, message: "请选择仓库", trigger: "change" }],
+  quantity: [{ required: true, message: "请输入入库数量", trigger: "blur" }],
   exWarehousePerson: [
     { required: true, message: "请输入入库人", trigger: "blur" },
   ],
@@ -289,29 +290,17 @@ const openModal = () => {
 };
 const pushGoods = (goods) => {
   if (goods && goods.length > 0) {
-    let afterFiltering = [];
-    if (formData.data.list && formData.data.list.length > 0) {
-      afterFiltering = goods.filter((item) => {
-        let data = formData.data.list.filter(
-          (itemProduct) => itemProduct.productId === item.id
-        );
-        if (data && data.length > 0) {
-          return false;
-        }
-        return true;
-      });
-    } else {
-      afterFiltering = goods;
-    }
     formData.data.list = formData.data.list.concat(
-      afterFiltering.map((item) => {
+      goods.map((item) => {
         return {
+          isScan: "0",
           productCode: item.code,
           productId: item.id,
           productName: item.name,
           productSpec: item.spec,
           productUnit: item.unit,
           quantity: undefined,
+          purchaseDetailId: "",
         };
       })
     );
@@ -319,7 +308,7 @@ const pushGoods = (goods) => {
       message: "添加成功！",
       type: "success",
     });
-    openProduct.value = false;
+    // openProduct.value = false;
   } else {
     ElMessage("请选择至少一件产品");
   }
@@ -382,11 +371,11 @@ const scanData = ref([
 ]);
 const scanValue = ref("");
 const isScan = ref(false);
-const btnTitle = ref("扫码出库");
+const btnTitle = ref("扫码入库");
 const scanInput = ref(null);
 const handleClickScan = () => {
   isScan.value = !isScan.value;
-  btnTitle.value = isScan.value ? "取消扫码" : "扫码入库";
+  btnTitle.value = isScan.value ? "扫码中···" : "扫码入库";
   if (isScan.value) {
     scanInput.value.focus();
   }
@@ -440,7 +429,7 @@ const handleScanValueChange = (val) => {
     top: 50%;
     left: 50%;
     transform: translate(-50%, -50%);
-    font-size: 20px;
+    font-size: 30px;
     font-weight: 700;
     color: #5df5e9;
     cursor: pointer;

src/views/purchaseSales/outAndInWarehouse/record/index.vue

@@ -302,28 +302,28 @@ const config = computed(() => {
         width: 155,
       },
     },
-    {
-      attrs: {
-        label: "操作",
-        width: "80",
-        align: "center",
-      },
-      renderHTML(row) {
-        return [
-          {
-            attrs: {
-              label: "打印",
-              type: "primary",
-              text: true,
-            },
-            el: "button",
-            click() {
-              handlePrintPdf(row);
-            },
-          },
-        ];
-      },
-    },
+    // {
+    //   attrs: {
+    //     label: "操作",
+    //     width: "80",
+    //     align: "center",
+    //   },
+    //   renderHTML(row) {
+    //     return [
+    //       {
+    //         attrs: {
+    //           label: "打印",
+    //           type: "primary",
+    //           text: true,
+    //         },
+    //         el: "button",
+    //         click() {
+    //           handlePrintPdf(row);
+    //         },
+    //       },
+    //     ];
+    //   },
+    // },
   ];
 });
 const getDict = () => {

src/views/purchaseSales/outAndInWarehouse/waitingForDelivery/index.vue

@@ -540,7 +540,7 @@ const btnTitle = ref("扫码出库");
 const scanInput = ref(null);
 const handleClickScan = () => {
   isScan.value = !isScan.value;
-  btnTitle.value = isScan.value ? "取消扫码" : "扫码出库";
+  btnTitle.value = isScan.value ? "扫码中···" : "扫码出库";
   if (isScan.value) {
     scanInput.value.focus();
   }
@@ -626,7 +626,7 @@ const handleDelete = (index) => {
     top: 50%;
     left: 50%;
     transform: translate(-50%, -50%);
-    font-size: 20px;
+    font-size: 30px;
     font-weight: 700;
     color: #5df5e9;
     cursor: pointer;