提交

src/views/business/carrier/index.vue

@@ -139,8 +139,7 @@
                 <!--                >-->
                 <!--                  编辑-->
                 <!--                </el-button>-->
-                <el-button  link type="primary" icon="Comment"
-                  @click="handleCheckHidtory(scope.row)" >
+                <el-button link type="primary" icon="Comment" @click="handleCheckHidtory(scope.row)">
                   废弃明细
                 </el-button>
                 <el-button v-if="scope.row.isAbandoned === 0" link type="danger" icon="Delete"
@@ -405,18 +404,18 @@ const handleShowCarrierDialog = (id) => {
 /**打开废弃弹窗 */
 const handleShowAbandonDialog = (id) => {
   //判断如果无箱正在被使用，则不允许废弃
-if(currentCategory.value.isNone == 1){
-  checkCanAbandoned(id).then((res) => {
-    if (!res.data) {
+  if (currentCategory.value.isNone == 1) {
+    checkCanAbandoned(id).then((res) => {
+      if (!res.data) {
         proxy.$modal.msgError(res.msg)
-      }else{
+      } else {
         proxy.$refs.carrierAbandonmentRef.open({ id: id });
       }
-  });
-}else{
-  proxy.$refs.carrierAbandonmentRef.open({ id: id });
-}
-  
+    });
+  } else {
+    proxy.$refs.carrierAbandonmentRef.open({ id: id });
+  }
+
 };
 /** 取消废弃*/
 const handleUnAbandoned = (row) => {
@@ -455,21 +454,21 @@ const handleBatchPrintQrCode = async () => {
   //   }
 
   // });
-  if(selections.value.length >0 && currentCategory.value.isNone == 0){
-  const res = await whether(selections.value)
-  if (res.code == 200) {
-    const imageGroup = document.getElementById("image-group");
-    const res1 = await printUpdate(selections.value.map(e => e.id))
-    if (res1.code == 200) {
-      handleRefreshCarrier()
-      printJS({
-        printable: "image-group", // 这里是你要打印内容的DOM元素的id
-        type: "html",
-        style: "@page { size: auto;  margin: 0mm; }", // 可以添加打印样式
-      });
+  if (selections.value.length > 0 && currentCategory.value.isNone == 0) {
+    const res = await whether(selections.value)
+    if (res.code == 200) {
+      const imageGroup = document.getElementById("image-group");
+      const res1 = await printUpdate(selections.value.map(e => e.id))
+      if (res1.code == 200) {
+        handleRefreshCarrier()
+        printJS({
+          printable: "image-group", // 这里是你要打印内容的DOM元素的id
+          type: "html",
+          style: "@page { size: auto;  margin: 0mm; }", // 可以添加打印样式
+        });
+      }
+      // window.print();
     }
-    // window.print();
-  }
   }
 };
 
@@ -501,33 +500,33 @@ const handleBatchPrintPdf = () => {
 // }
 /**批量下载二维码 */
 async function handleBatchDownloadQrCode() {
-  if(selections.value.length >0 && currentCategory.value.isNone == 0){
-  console.log(selections.value);
+  if (selections.value.length > 0 && currentCategory.value.isNone == 0) {
+    console.log(selections.value);
 
-  whether(selections.value).then(async (res) => {
-    if (res.code == 200) {
-      const zip = new JSZip();
-      const zipFilename = "二维码.zip";
-      for (var i = 0; i < selections.value.length; i++) {
-        console.log(webHost + selections.value[i].qcCode);
+    whether(selections.value).then(async (res) => {
+      if (res.code == 200) {
+        const zip = new JSZip();
+        const zipFilename = "二维码.zip";
+        for (var i = 0; i < selections.value.length; i++) {
+          console.log(webHost + selections.value[i].qcCode);
 
-        // 下载二维码图片数据
-        const qrCodeResponse = await fetch(
-          webHost + selections.value[i].qcCode
-        );
-        const qrCodeBlob = await qrCodeResponse.blob();
+          // 下载二维码图片数据
+          const qrCodeResponse = await fetch(
+            webHost + selections.value[i].qcCode
+          );
+          const qrCodeBlob = await qrCodeResponse.blob();
 
-        // 将二维码图片添加到 ZIP 文件中
-        zip.file(selections.value[i].code + ".png", qrCodeBlob);
+          // 将二维码图片添加到 ZIP 文件中
+          zip.file(selections.value[i].code + ".png", qrCodeBlob);
+        }
+        // 生成 ZIP 文件并提供下载
+        zip.generateAsync({ type: "blob" }).then((content) => {
+          // 使用 FileSaver.js 将 ZIP 文件保存到本地
+          saveAs(content, zipFilename);
+        });
       }
-      // 生成 ZIP 文件并提供下载
-      zip.generateAsync({ type: "blob" }).then((content) => {
-        // 使用 FileSaver.js 将 ZIP 文件保存到本地
-        saveAs(content, zipFilename);
-      });
-    }
-  });
-}
+    });
+  }
 }
 
 onMounted(() => {

src/views/business/dayworkSelect/form.vue

@@ -1,75 +1,36 @@
 <template>
   <!-- 添加或修改项目信息对话框 -->
-  <el-drawer
-    v-model="visible"
-    size="80%"
-    direction="rtl"
-    :close-on-press-escape="false"
-  >
+  <el-drawer v-model="visible" size="80%" direction="rtl" :close-on-press-escape="false">
     <div class="page-container form-container">
       <div class="form-btns-container">
-        <span class="title-label"
-          ><el-icon>
+        <span class="title-label"><el-icon>
             <Document />
           </el-icon>
-          报工详情</span
-        >
+          报工详情</span>
         <el-button icon="Close" @click="handleCancel">取 消 </el-button>
       </div>
       <!-- 主表 -->
-      <el-form
-        ref="dayworkItemRef"
-        class="master-container"
-        :model="form"
-        :rules="rules"
-        :show-message="true"
-      >
+      <el-form ref="dayworkItemRef" class="master-container" :model="form" :rules="rules" :show-message="true">
         <el-row :gutter="20">
           <el-col :span="7">
             <el-form-item label="开始时间：" prop="startTime">
-              <el-date-picker
-                v-model="form.startTime"
-                :disabled="true"
-                type="datetime"
-                value-format="YYYY-MM-DD HH:mm:ss "
-                :clearable="false"
-                :editable="false"
-                placeholder="请选择开始时间"
-                @change="handleTotalTime"
-              />
+              <el-date-picker v-model="form.startTime" :disabled="true" type="datetime"
+                value-format="YYYY-MM-DD HH:mm:ss " :clearable="false" :editable="false" placeholder="请选择开始时间"
+                @change="handleTotalTime" />
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item
-              label="工序名称："
-              prop="processId"
-              label-width="90px"
-            >
-              <el-select-v2
-                v-model="form.processId"
-                clearable
-                :disabled="true"
-                :options="processList"
-                placeholder="请选择工序"
-                style="width: 220px"
-              />
+            <el-form-item label="工序名称：" prop="processId" label-width="90px">
+              <el-select-v2 v-model="form.processId" clearable :disabled="true" :options="processList"
+                placeholder="请选择工序" style="width: 220px" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="生产状态：" prop="status" align="center">
-              <el-select
-                v-model="form.status"
-                placeholder="请选择生产状态"
-                :disabled="true"
-                style="width: 220px"
-                @change="handleChangeStatus"
-              >
-                <el-option
-                  v-for="dict in dynamicOptions"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
+              <el-select v-model="form.status" placeholder="请选择生产状态" :disabled="true" style="width: 220px"
+                @change="handleChangeStatus">
+                <el-option v-for="dict in dynamicOptions" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -77,91 +38,42 @@
         <el-row :gutter="20">
           <el-col :span="7">
             <el-form-item label="结束时间：" prop="endTime">
-              <el-date-picker
-                v-model="form.endTime"
-                :disabled="true"
-                type="datetime"
-                value-format="YYYY-MM-DD HH:mm:ss "
-                :editable="false"
-                :clearable="false"
-                placeholder="请选择结束时间"
-                @change="handleTotalTime"
-              />
+              <el-date-picker v-model="form.endTime" :disabled="true" type="datetime"
+                value-format="YYYY-MM-DD HH:mm:ss " :editable="false" :clearable="false" placeholder="请选择结束时间"
+                @change="handleTotalTime" />
             </el-form-item>
           </el-col>
           <el-col :span="9">
             <el-form-item label="操作者:" prop="nickName" label-width="82px">
-              <el-input
-                v-model.trim="form.nickName"
-                placeholder="请输入操作者"
-                :disabled="true"
-                readonly
-                :clearable="true"
-                style="width: 220px; margin-left: 8px"
-              >
+              <el-input v-model.trim="form.nickName" placeholder="请输入操作者" :disabled="true" readonly :clearable="true"
+                style="width: 220px; margin-left: 8px">
                 <template #append>
-                  <el-button
-                    icon="Search"
-                    @click="handleSelectUserSingle"
-                  /> </template
-              ></el-input>
+                  <el-button icon="Search" @click="handleSelectUserSingle" /> </template></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="投产量：" prop="prodNum" label-width="82px">
-              <el-input-number
-                v-model.trim="form.prodNum"
-                :disabled="true"
-                :precision="0"
-                controls-position="right"
-                style="width: 220px"
-              />
+              <el-input-number v-model.trim="form.prodNum" :disabled="true" :precision="0" controls-position="right"
+                style="width: 220px" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="7">
-            <el-form-item
-              label="总工时："
-              prop="workingHoursTime"
-              label-width="82px"
-            >
-              <el-input
-                v-model.trim="workingHoursTime"
-                :disabled="true"
-                style="width: 220px; margin-left: 0px"
-              />
+            <el-form-item label="总工时：" prop="workingHoursTime" label-width="82px">
+              <el-input v-model.trim="workingHoursTime" :disabled="true" style="width: 220px; margin-left: 0px" />
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item
-              label="合格数："
-              prop="qualifiedNum"
-              label-width="90px"
-              style="padding-right: 0px"
-            >
-              <el-input-number
-                v-model.trim="form.qualifiedNum"
-                :disabled="true"
-                :precision="0"
-                controls-position="right"
-                style="width: 220px"
-              />
+            <el-form-item label="合格数：" prop="qualifiedNum" label-width="90px" style="padding-right: 0px">
+              <el-input-number v-model.trim="form.qualifiedNum" :disabled="true" :precision="0"
+                controls-position="right" style="width: 220px" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item
-              label="设备："
-              prop="equipmentDetailId"
-              label-width="82px"
-            >
-              <el-select-v2
-                v-model="form.equipmentDetailId"
-                :disabled="true"
-                :options="equipmentList"
-                placeholder="请选择设备"
-                style="width: 220px"
-              >
+            <el-form-item label="设备：" prop="equipmentDetailId" label-width="82px">
+              <el-select-v2 v-model="form.equipmentDetailId" :disabled="true" :options="equipmentList"
+                placeholder="请选择设备" style="width: 220px">
               </el-select-v2>
             </el-form-item>
           </el-col>
@@ -173,48 +85,24 @@
       </el-form>
       <!-- 列表区 -->
       <div class="el-table-container">
-        <el-table
-          ref="dayworkItemRejectTable"
-          v-loading="loading"
-          row-key="id"
-          :data="form.groupRejectList"
-          height="100%"
-        >
+        <el-table ref="dayworkItemRejectTable" v-loading="loading" row-key="id" :data="form.groupRejectList"
+          height="100%">
           <el-table-column type="index" label="行号" width="60" align="center">
             <template #default="scope">
               {{ scope.$index + 1 }}
             </template>
           </el-table-column>
-          <el-table-column
-            label="废品数量"
-            width="200px"
-            prop="rejectNum"
-            align="center"
-          >
+          <el-table-column label="废品数量" width="200px" prop="rejectNum" align="center">
             <template #default="scope">
-              <el-input-number
-                v-model.trim="scope.row.rejectNum"
-                placeholder="废品数量"
-                :disabled="!editStatus"
-                :precision="0"
-                :min="0"
-                controls-position="right"
-              />
+              <el-input-number v-model.trim="scope.row.rejectNum" placeholder="废品数量" :disabled="!editStatus"
+                :precision="0" :min="0" controls-position="right" />
             </template>
           </el-table-column>
           <el-table-column prop="reason" label="废品原因" align="center">
             <template #default="scope">
-              <el-select
-                v-model="scope.row.reason"
-                :disabled="!editStatus"
-                placeholder="请选择废品原因"
-              >
-                <el-option
-                  v-for="cause in waste_causes"
-                  :key="cause.value"
-                  :label="cause.label"
-                  :value="cause.value"
-                ></el-option>
+              <el-select v-model="scope.row.reason" :disabled="!editStatus" placeholder="请选择废品原因">
+                <el-option v-for="cause in waste_causes" :key="cause.value" :label="cause.label"
+                  :value="cause.value"></el-option>
               </el-select>
             </template>
           </el-table-column>
@@ -240,6 +128,7 @@ const { daywork_status_edit } = proxy.useDict("daywork_status_edit");
 const { daywork_status_first } = proxy.useDict("daywork_status_first");
 const { daywork_status_second } = proxy.useDict("daywork_status_second");
 const { waste_causes } = proxy.useDict("waste_causes");
+const { report_up_limit } = proxy.useDict("report_up_limit")
 const detailInfo = ref({});
 const loading = ref(false);
 const processList = ref([]);
@@ -436,7 +325,7 @@ const open = (row) => {
     visible.value = true;
   }
 };
-function handleSelectUserSingle() {}
+function handleSelectUserSingle() { }
 /**
  * 对话框关闭 事件
  */
@@ -486,10 +375,10 @@ const handleSave = () => {
           flag = false;
           proxy.$modal.msgError(
             "第" +
-              (i + 1) +
-              "行废品原因与" +
-              (reasonList.indexOf(form.value.groupRejectList[i].reason) + 1) +
-              "行相同"
+            (i + 1) +
+            "行废品原因与" +
+            (reasonList.indexOf(form.value.groupRejectList[i].reason) + 1) +
+            "行相同"
           );
           return;
         }
@@ -542,10 +431,10 @@ const handleSave = () => {
             proxy.$modal
               .confirm(
                 "合格数为投产量" +
-                  percent +
-                  "%,超出投产量" +
-                  num +
-                  "。 是否继续保存！"
+                percent +
+                "%,超出投产量" +
+                num +
+                "。 是否继续保存！"
               )
               .then(function () {
                 updateDayworkItem();
@@ -560,8 +449,9 @@ const handleSave = () => {
             if (form.value.qualifiedNum <= max) {
               updateDayworkItem();
             } else {
+              const upLimit = report_up_limit.value[0].value
               proxy.$modal.msgError(
-                "合格数不能超过投产量的103%,最大合格数为" + max
+                `合格数不能超过投产量的${upLimit}%,最大合格数为` + max
               );
             }
           }

src/views/business/dayworkSelect/index.vue

@@ -76,7 +76,7 @@
             <el-table-column label="批次号" min-width="120" prop="lotCode" align="center">
               <template #default="scope">
                 <el-button link type="primary" @click="handleColumnClick(scope.row)"><span>{{ scope.row.lotCode
-                }}</span></el-button>
+                    }}</span></el-button>
                 <!-- <span v-else>{{ scope.row.lotCode }}</span> -->
               </template>
             </el-table-column>
@@ -445,8 +445,8 @@ function handleDeletedItem(id) {
 //修改报工信息
 function handleSelectDayworkItem(row) {
   console.log(report_up_limit)
-  const upLimitForReport = Number(report_up_limit.value[0].dictValue) / 100
-  const upLimitForSort = Number(sort_report_up_limit.value[0].dictValue) / 100
+  const upLimitForReport = Number(report_up_limit.value[0].value) / 100
+  const upLimitForSort = Number(sort_report_up_limit.value[0].value) / 100
   //同工序下状态是否有工序已完成
   let processFinish = false;
   //除了编辑此条以外的同工序合格数

src/views/business/dayworkSelect/sortForm.vue

@@ -1,75 +1,36 @@
 <template>
   <!-- 添加或修改项目信息对话框 -->
-  <el-drawer
-    v-model="visible"
-    size="80%"
-    direction="rtl"
-    :close-on-press-escape="false"
-  >
+  <el-drawer v-model="visible" size="80%" direction="rtl" :close-on-press-escape="false">
     <div class="page-container form-container">
       <div class="form-btns-container">
-        <span class="title-label"
-          ><el-icon>
+        <span class="title-label"><el-icon>
             <Document />
           </el-icon>
-          报工详情</span
-        >
+          报工详情</span>
         <el-button icon="Close" @click="handleCancel">取 消 </el-button>
       </div>
       <!-- 主表 -->
-      <el-form
-        ref="dayworkItemRef"
-        class="master-container"
-        :model="form"
-        :rules="rules"
-        :show-message="true"
-      >
+      <el-form ref="dayworkItemRef" class="master-container" :model="form" :rules="rules" :show-message="true">
         <el-row :gutter="20">
           <el-col :span="7">
             <el-form-item label="开始时间：" prop="startTime">
-              <el-date-picker
-                v-model="form.startTime"
-                :disabled="true"
-                type="datetime"
-                value-format="YYYY-MM-DD HH:mm:ss "
-                :clearable="false"
-                :editable="false"
-                placeholder="请选择开始时间"
-                @change="handleTotalTime"
-              />
+              <el-date-picker v-model="form.startTime" :disabled="true" type="datetime"
+                value-format="YYYY-MM-DD HH:mm:ss " :clearable="false" :editable="false" placeholder="请选择开始时间"
+                @change="handleTotalTime" />
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item
-              label="工序名称："
-              prop="processId"
-              label-width="90px"
-            >
-              <el-select-v2
-                v-model="form.processId"
-                clearable
-                :disabled="true"
-                :options="processList"
-                placeholder="请选择工序"
-                style="width: 220px"
-              />
+            <el-form-item label="工序名称：" prop="processId" label-width="90px">
+              <el-select-v2 v-model="form.processId" clearable :disabled="true" :options="processList"
+                placeholder="请选择工序" style="width: 220px" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="生产状态：" prop="status" align="center">
-              <el-select
-                v-model="form.status"
-                placeholder="请选择生产状态"
-                :disabled="true"
-                style="width: 220px"
-                @change="handleChangeStatus"
-              >
-                <el-option
-                  v-for="dict in dynamicOptions"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
+              <el-select v-model="form.status" placeholder="请选择生产状态" :disabled="true" style="width: 220px"
+                @change="handleChangeStatus">
+                <el-option v-for="dict in dynamicOptions" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -77,28 +38,15 @@
         <el-row :gutter="20">
           <el-col :span="7">
             <el-form-item label="结束时间：" prop="endTime">
-              <el-date-picker
-                v-model="form.endTime"
-                :disabled="true"
-                type="datetime"
-                value-format="YYYY-MM-DD HH:mm:ss "
-                :editable="false"
-                :clearable="false"
-                placeholder="请选择结束时间"
-                @change="handleTotalTime"
-              />
+              <el-date-picker v-model="form.endTime" :disabled="true" type="datetime"
+                value-format="YYYY-MM-DD HH:mm:ss " :editable="false" :clearable="false" placeholder="请选择结束时间"
+                @change="handleTotalTime" />
             </el-form-item>
           </el-col>
           <el-col :span="9">
             <el-form-item label="操作者:" prop="nickName" label-width="82px">
-              <el-input
-                v-model.trim="form.nickName"
-                placeholder="请输入操作者"
-                :disabled="true"
-                readonly
-                :clearable="true"
-                style="width: 220px; margin-left: 8px"
-              >
+              <el-input v-model.trim="form.nickName" placeholder="请输入操作者" :disabled="true" readonly :clearable="true"
+                style="width: 220px; margin-left: 8px">
                 <template #append>
                   <el-button icon="Search" @click="handleSelectUserSingle" />
                 </template>
@@ -107,59 +55,27 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="投产量：" prop="prodNum" label-width="82px">
-              <el-input-number
-                v-model.trim="form.prodNum"
-                :disabled="true"
-                :precision="0"
-                controls-position="right"
-                style="width: 220px"
-              />
+              <el-input-number v-model.trim="form.prodNum" :disabled="true" :precision="0" controls-position="right"
+                style="width: 220px" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="7">
-            <el-form-item
-              label="总工时："
-              prop="workingHoursTime"
-              label-width="82px"
-            >
-              <el-input
-                v-model.trim="workingHoursTime"
-                :disabled="true"
-                style="width: 220px; margin-left: 0px"
-              />
+            <el-form-item label="总工时：" prop="workingHoursTime" label-width="82px">
+              <el-input v-model.trim="workingHoursTime" :disabled="true" style="width: 220px; margin-left: 0px" />
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item
-              label="合格数："
-              prop="qualifiedNum"
-              label-width="90px"
-              style="padding-right: 0px"
-            >
-              <el-input-number
-                v-model.trim="form.qualifiedNum"
-                :disabled="true"
-                :precision="0"
-                controls-position="right"
-                style="width: 220px"
-              />
+            <el-form-item label="合格数：" prop="qualifiedNum" label-width="90px" style="padding-right: 0px">
+              <el-input-number v-model.trim="form.qualifiedNum" :disabled="true" :precision="0"
+                controls-position="right" style="width: 220px" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item
-              label="设备："
-              prop="equipmentDetailId"
-              label-width="82px"
-            >
-              <el-select-v2
-                v-model="form.equipmentDetailId"
-                :disabled="true"
-                :options="equipmentList"
-                placeholder="请选择设备"
-                style="width: 220px"
-              >
+            <el-form-item label="设备：" prop="equipmentDetailId" label-width="82px">
+              <el-select-v2 v-model="form.equipmentDetailId" :disabled="true" :options="equipmentList"
+                placeholder="请选择设备" style="width: 220px">
               </el-select-v2>
             </el-form-item>
           </el-col>
@@ -171,87 +87,40 @@
       </el-form>
       <!-- 列表区 -->
       <div class="el-table-container">
-        <el-table
-          ref="dayworkItemRejectTable"
-          v-loading="loading"
-          row-key="id"
-          :data="form.groupRejectList"
-          height="100%"
-        >
+        <el-table ref="dayworkItemRejectTable" v-loading="loading" row-key="id" :data="form.groupRejectList"
+          height="100%">
           <el-table-column type="index" label="行号" width="60" align="center">
             <template #default="scope">
               {{ scope.$index + 1 }}
             </template>
           </el-table-column>
-          <el-table-column
-            prop="type"
-            label="分选检查类型"
-            align="center"
-            width="150px"
-          >
+          <el-table-column prop="type" label="分选检查类型" align="center" width="150px">
             <template #default="scope">
-              <el-select
-                v-model="scope.row.type"
-                :disabled="true"
-                placeholder="请选择分选检查类型"
-                @change="(arg) => handleChangeType(scope.row, arg)"
-              >
-                <el-option
-                  v-for="cause in sort_standard_type"
-                  :key="cause.value"
-                  :label="cause.label"
-                  :value="cause.value"
-                ></el-option>
+              <el-select v-model="scope.row.type" :disabled="true" placeholder="请选择分选检查类型"
+                @change="(arg) => handleChangeType(scope.row, arg)">
+                <el-option v-for="cause in sort_standard_type" :key="cause.value" :label="cause.label"
+                  :value="cause.value"></el-option>
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="sortStandard"
-            label="分选检查标准"
-            align="center"
-            width="300px"
-          >
+          <el-table-column prop="sortStandard" label="分选检查标准" align="center" width="300px">
             <template #default="scope">
-              <el-select
-                v-model="scope.row.sortStandard"
-                :disabled="true"
-                placeholder="请选择分选检查标准"
-              >
-                <el-option
-                  v-for="cause in scope.row.standardList"
-                  :key="cause.value"
-                  :label="cause.label"
-                  :value="cause.value"
-                ></el-option>
+              <el-select v-model="scope.row.sortStandard" :disabled="true" placeholder="请选择分选检查标准">
+                <el-option v-for="cause in scope.row.standardList" :key="cause.value" :label="cause.label"
+                  :value="cause.value"></el-option>
               </el-select>
             </template>
           </el-table-column>
           <el-table-column prop="reason" label="检查结果" align="center">
             <template #default="scope">
-              <el-input
-                v-model.trim="scope.row.reason"
-                placeholder="请输入检查结果"
-                :disabled="true"
-                :clearable="true"
-                style="margin-left: 8px"
-              />
+              <el-input v-model.trim="scope.row.reason" placeholder="请输入检查结果" :disabled="true" :clearable="true"
+                style="margin-left: 8px" />
             </template>
           </el-table-column>
-          <el-table-column
-            label="废品数量"
-            width="200px"
-            prop="rejectNum"
-            align="center"
-          >
+          <el-table-column label="废品数量" width="200px" prop="rejectNum" align="center">
             <template #default="scope">
-              <el-input-number
-                v-model.trim="scope.row.rejectNum"
-                placeholder="废品数量"
-                :disabled="true"
-                :precision="0"
-                :min="0"
-                controls-position="right"
-              />
+              <el-input-number v-model.trim="scope.row.rejectNum" placeholder="废品数量" :disabled="true" :precision="0"
+                :min="0" controls-position="right" />
             </template>
           </el-table-column>
         </el-table>
@@ -277,6 +146,7 @@ const { daywork_status_edit } = proxy.useDict("daywork_status_edit");
 const { daywork_status_first } = proxy.useDict("daywork_status_first");
 const { daywork_status_second } = proxy.useDict("daywork_status_second");
 const { sort_standard_type } = proxy.useDict("sort_standard_type");
+const { sort_report_up_limit } = proxy.useDict("sort_report_up_limit")
 const detailInfo = ref({});
 const loading = ref(false);
 const processList = ref([]);
@@ -487,7 +357,7 @@ function close() {
   visible.value = false;
 }
 
-function handleSelectUserSingle() {}
+function handleSelectUserSingle() { }
 
 /** 表单重置 */
 function reset() {
@@ -552,11 +422,11 @@ const handleSave = () => {
           flag = false;
           proxy.$modal.msgError(
             "第" +
-              (i + 1) +
-              "行分选检查标准与" +
-              (reasonList.indexOf(form.value.groupRejectList[i].sortStandard) +
-                1) +
-              "行相同"
+            (i + 1) +
+            "行分选检查标准与" +
+            (reasonList.indexOf(form.value.groupRejectList[i].sortStandard) +
+              1) +
+            "行相同"
           );
           return;
         }
@@ -619,10 +489,10 @@ const handleSave = () => {
             proxy.$modal
               .confirm(
                 "合格数为投产量" +
-                  percent +
-                  "%,超出投产量" +
-                  num +
-                  "。 是否继续保存！"
+                percent +
+                "%,超出投产量" +
+                num +
+                "。 是否继续保存！"
               )
               .then(function () {
                 updateDayworkItem();
@@ -637,8 +507,9 @@ const handleSave = () => {
             if (form.value.qualifiedNum <= max) {
               updateDayworkItem();
             } else {
+              const upLimit = sort_report_up_limit.value[0].value
               proxy.$modal.msgError(
-                "合格数不能超过投产量的103%,最大合格数为" + max
+                `合格数不能超过投产量的${upLimit}%,最大合格数为` + max
               );
             }
           }

src/views/business/dayworkUpdate/form.vue

@@ -147,6 +147,7 @@ const { daywork_status_edit } = proxy.useDict("daywork_status_edit");
 const { daywork_status_first } = proxy.useDict("daywork_status_first");
 const { daywork_status_second } = proxy.useDict("daywork_status_second");
 const { waste_causes } = proxy.useDict("waste_causes");
+const { report_up_limit } = proxy.useDict("report_up_limit")
 const detailInfo = ref({});
 const loading = ref(false);
 const processList = ref([]);
@@ -478,8 +479,9 @@ const handleSave = () => {
             if (form.value.qualifiedNum <= max) {
               updateDayworkItem();
             } else {
+              const upLimit = report_up_limit.value[0].value
               proxy.$modal.msgError(
-                "合格数不能超过投产量的103%,最大合格数为" + max
+                `合格数不能超过投产量的${upLimit}%,最大合格数为` + max
               );
             }
           }

src/views/business/dayworkUpdate/index.vue

@@ -305,8 +305,8 @@ function handleDeletedItem(id) {
 function handleUpdateDayworkItem(row) {
 
   console.log(report_up_limit.value)
-  const upLimitForReport = Number(report_up_limit.value[0].dictValue) / 100
-  const upLimitForSort = Number(sort_report_up_limit.value[0].dictValue) / 100
+  const upLimitForReport = Number(report_up_limit.value[0].value) / 100
+  const upLimitForSort = Number(sort_report_up_limit.value[0].value) / 100
   //同工序下状态是否有工序已完成
   let processFinish = false;
   //除了编辑此条以外的同工序合格数
@@ -336,6 +336,8 @@ function handleUpdateDayworkItem(row) {
     (Math.floor(row.prodNum * upLimitForSort - totalQuailifiedNum) > 0
       ? Math.floor(row.prodNum * upLimitForSort - totalQuailifiedNum)
       : 0);
+
+  console.log(row.isSort, row.prodNum, upLimitForReport, upLimitForSort, totalQuailifiedNum)
   //该daywork合格数总数不能超过投产数的103%
   row.technologicalProcessId = queryItemParams.value.technologicalProcessId;
   //row.deptId = queryDayworkParams.value.deptId;

src/views/business/dayworkUpdate/sortForm.vue

@@ -179,6 +179,7 @@ const dynamicOptions = ref([]);
 const workingHoursTime = ref("");
 const maxQuailifiedNum = ref(0);
 const sortProductInspection = ref([])
+const { sort_report_up_limit } = proxy.useDict("sort_report_up_limit")
 const detailsRow = {
   id: null,
   type: null,
@@ -542,8 +543,10 @@ const handleSave = () => {
             if (form.value.qualifiedNum <= max) {
               updateDayworkItem();
             } else {
+              const upLimit = sort_report_up_limit.value[0].value
+              console.log(upLimit)
               proxy.$modal.msgError(
-                "合格数不能超过投产量的103%,最大合格数为" + max
+                `合格数不能超过投产量的${upLimit}%,最大合格数为` + max
               );
             }
           }

src/views/business/dayworkUpdate/turnoverForm.vue

@@ -567,13 +567,13 @@ const handleSave = () => {
                 return;
               });
           } else {
-            if (form.value.qualifiedNum <= max) {
-              updateDayworkItem();
-            } else {
-              proxy.$modal.msgError(
-                "合格数不能超过投产量的103%,最大合格数为" + max
-              );
-            }
+            // if (form.value.qualifiedNum <= max) {
+            //   updateDayworkItem();
+            // } else {
+            //   proxy.$modal.msgError(
+            //     "合格数不能超过投产量的103%,最大合格数为" + max
+            //   );
+            // }
           }
         } else {
           updateDayworkItem();