From 79e366c4d6e1f1108cce5773fdedca9822356fae Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Mon, 15 Jul 2024 13:40:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=20=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=20=E6=96=B0=E5=A2=9E=E5=8F=8A=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/biz/storage/StorageForm.vue     |  5 +-
 .../src/views/biz/storage/index.vue           | 49 ++++++++++++----
 .../src/views/biz/storage/indexAudit.vue      | 56 +++++++++++++++----
 .../biz/unqualifiednotification/detail.vue    | 30 ++++++++++
 .../biz/unqualifiednotification/index.vue     | 10 +++-
 .../biz/unqualifiednotification/statistic.vue |  4 +-
 6 files changed, 124 insertions(+), 30 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageForm.vue
index c1cc9390..97554704 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageForm.vue
@@ -36,9 +36,9 @@
                   <el-select
                     v-model="formData.stockInType"
                     clearable
+                    disabled
                     style="width: 100%"
                     @change="handleStockType"
-                    v-bind:disabled="ctrView || ctrSave || enableHeadNo || activetype !== 'create'"
                   >
                     <el-option
                       v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_STORAGE_IN_TYPE)"
@@ -55,11 +55,10 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item label="单据日期" prop="createTime">
-                  <!-- {{ formatDate(formData.createTime, 'YYYY-MM-DD HH:mm:ss') }} -->
                   <el-date-picker
                     v-model="formData.createTime"
                     value-format="x"
-                    placeholder="单据日期"
+                    placeholder="系统自动生成"
                     disabled
                     class="!w-400px"
                   />
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/index.vue
index 0d26144d..2564e7b9 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/index.vue
@@ -13,19 +13,20 @@
         <el-form-item label="退料单号" prop="stockNo">
           <el-input
             v-model="queryParams.stockNo"
-            placeholder="入库单号"
+            placeholder="退料单号"
             clearable
             @keyup.enter="handleQuery"
             class="!w-240px"
           />
         </el-form-item>
-        <el-form-item label="单据日期" prop="stockNo">
-          <el-input
-            v-model="queryParams.stockNo"
+        <el-form-item label="单据日期" prop="createTime">
+          <el-date-picker
+            v-model="getDateRangevalue"
+            type="date"
             placeholder="单据日期"
-            clearable
-            @keyup.enter="handleQuery"
+            :size="size"
             class="!w-240px"
+            @change="getDateRange"
           />
         </el-form-item>
         <el-form-item label="物料编码" prop="matNo">
@@ -169,16 +170,14 @@
         </el-table-column>
         <el-table-column label="操作" align="right" min-width="180" fixed="right">
           <template #header>
-            <span style="margin-right:35%">
-              操作
-            </span>
+            <span style="margin-right: 35%"> 操作 </span>
           </template>
           <template #default="scope">
             <el-button
               link
               type="primary"
               @click="openDetail('update', scope.row.id)"
-             v-if="scope.row.status != 4&&scope.row.status != 2"
+              v-if="scope.row.status != 4 && scope.row.status != 2"
             >
               编辑
             </el-button>
@@ -247,7 +246,9 @@ const queryParams = reactive({
   cancel: undefined,
   cancelTime: [],
   matNo: undefined,
-  matName: undefined
+  matName: undefined,
+  minCreateTime: undefined,
+  maxCreateTime: undefined
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
@@ -278,6 +279,32 @@ const resetQuery = () => {
   handleQuery()
 }
 
+const getDateRangevalue = ref() // 日期范围
+//处理日期
+const getDateRange = (getDateRangevalue) => {
+  if (getDateRangevalue == null) {
+    queryParams.minCreateTime = undefined
+    queryParams.maxCreateTime = undefined
+  } else {
+    queryParams.minCreateTime =
+      getDateRangevalue.toLocaleDateString('en-CA', {
+        year: 'numeric',
+        month: '2-digit',
+        day: '2-digit'
+      }) +
+      ' ' +
+      '00:00:00'
+    queryParams.maxCreateTime =
+      getDateRangevalue.toLocaleDateString('en-CA', {
+        year: 'numeric',
+        month: '2-digit',
+        day: '2-digit'
+      }) +
+      ' ' +
+      '23:59:59'
+  }
+}
+
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm = (type: string, id?: number) => {
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/indexAudit.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/indexAudit.vue
index 48cd4c9e..92fe2ceb 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/indexAudit.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/indexAudit.vue
@@ -1,6 +1,6 @@
 <template>
   <el-card class="hl-card">
-    <template #header> <span>退料申请</span></template>
+    <template #header> <span>退料审核</span></template>
     <ContentWrap class="borderxx">
       <!-- 搜索工作栏 -->
       <el-form
@@ -13,19 +13,20 @@
         <el-form-item label="退料单号" prop="stockNo">
           <el-input
             v-model="queryParams.stockNo"
-            placeholder="入库单号"
+            placeholder="退料单号"
             clearable
             @keyup.enter="handleQuery"
             class="!w-240px"
           />
         </el-form-item>
-        <el-form-item label="单据日期" prop="stockNo">
-          <el-input
-            v-model="queryParams.stockNo"
+        <el-form-item label="单据日期" prop="createTime">
+          <el-date-picker
+            v-model="getDateRangevalue"
+            type="date"
             placeholder="单据日期"
-            clearable
-            @keyup.enter="handleQuery"
+            :size="size"
             class="!w-240px"
+            @change="getDateRange"
           />
         </el-form-item>
         <el-form-item label="物料编码" prop="matNo">
@@ -169,12 +170,15 @@
         </el-table-column>
         <el-table-column label="操作" align="right" min-width="180" fixed="right">
           <template #header>
-            <span style="margin-right:35%">
-              操作
-            </span>
+            <span style="margin-right: 35%"> 操作 </span>
           </template>
           <template #default="scope">
-            <el-button link type="primary" @click="openDetail('Check', scope.row.id)" v-if="scope.row.status ==2">
+            <el-button
+              link
+              type="primary"
+              @click="openDetail('Check', scope.row.id)"
+              v-if="scope.row.status == 2"
+            >
               审核
             </el-button>
             <el-button link type="primary" @click="openDetail('review', scope.row.id)">
@@ -242,7 +246,9 @@ const queryParams = reactive({
   cancel: undefined,
   cancelTime: [],
   matNo: undefined,
-  matName: undefined
+  matName: undefined,
+  minCreateTime: undefined,
+maxCreateTime: undefined,
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
@@ -273,6 +279,32 @@ const resetQuery = () => {
   handleQuery()
 }
 
+const getDateRangevalue = ref() // 日期范围
+//处理日期
+const getDateRange = (getDateRangevalue) => {
+  if (getDateRangevalue == null) {
+    queryParams.minCreateTime = undefined
+    queryParams.maxCreateTime = undefined
+  } else {
+    queryParams.minCreateTime =
+      getDateRangevalue.toLocaleDateString('en-CA', {
+        year: 'numeric',
+        month: '2-digit',
+        day: '2-digit'
+      }) +
+      ' ' +
+      '00:00:00'
+    queryParams.maxCreateTime =
+      getDateRangevalue.toLocaleDateString('en-CA', {
+        year: 'numeric',
+        month: '2-digit',
+        day: '2-digit'
+      }) +
+      ' ' +
+      '23:59:59'
+  }
+}
+
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm = (type: string, id?: number) => {
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/unqualifiednotification/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/unqualifiednotification/detail.vue
index bc502514..4fc732c1 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/unqualifiednotification/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/unqualifiednotification/detail.vue
@@ -47,6 +47,16 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="检验数量" prop="checkAmount">
+              <el-input
+                disabled
+                class="!w-260px"
+                v-model="formData.checkAmount"
+                placeholder="请输入检验数量"
+              />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
@@ -266,6 +276,26 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="解决方案描述" prop="solutionContent">
+              <el-input
+                disabled
+                class="!w-260px"
+                v-model="formData.solutionContent"
+                placeholder="解决方案描述"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="处罚意见" prop="punishmentOpinion">
+              <el-input
+                disabled
+                class="!w-260px"
+                v-model="formData.punishmentOpinion"
+                placeholder="处罚意见"
+              />
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-card>
       <el-dialog v-model="activeOpinionDialogVisible" title="" width="30%" center>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/unqualifiednotification/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/unqualifiednotification/index.vue
index 70ba3c9a..46c9ea19 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/unqualifiednotification/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/unqualifiednotification/index.vue
@@ -195,9 +195,15 @@
         <!-- 新增生产车间 -->
         <el-table-column label="生产车间" align="center" prop="workshopName" min-width="160" />
         <el-table-column label="责任工序" align="center" prop="procedureName" min-width="160" />
+        
+        <el-table-column label="检验数量" align="center" prop="checkAmount" min-width="140" />
         <el-table-column label="异常数量" align="center" prop="amount" min-width="140" />
         <el-table-column label="责任人" align="center" prop="ownerName" min-width="160" />
         <el-table-column label="情况描述" align="center" prop="remark" min-width="160" />
+        <el-table-column label="解决方案描述" align="center" prop="solutionContent" min-width="160" />
+        <el-table-column label="处罚意见" align="center" prop="punishmentOpinion" min-width="160" />
+        
+
         <el-table-column
           label="创建时间"
           align="center"
@@ -346,7 +352,7 @@ const getDateRange = (getDateRangevalue) => {
         month: '2-digit',
         day: '2-digit'
       }) +
-      '' +
+      ' ' +
       '00:00:00'
     queryParams.maxCreateTime =
       getDateRangevalue.toLocaleDateString('en-CA', {
@@ -354,7 +360,7 @@ const getDateRange = (getDateRangevalue) => {
         month: '2-digit',
         day: '2-digit'
       }) +
-      '' +
+      ' ' +
       '23:59:59'
   }
 }
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/unqualifiednotification/statistic.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/unqualifiednotification/statistic.vue
index 4956d281..23fd6030 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/unqualifiednotification/statistic.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/unqualifiednotification/statistic.vue
@@ -62,8 +62,8 @@
         <el-table-column label="生产总数" align="center" prop="productAmount" min-width="140" />
         <el-table-column  label="检验数量" align="center" prop="checkAmount" min-width="140" />
         <el-table-column  label="不合格详细描述" align="center" prop="remark" min-width="140" />
-        <el-table-column  label="解决方案" align="center" prop="solutioncontent" min-width="140" />
-        <el-table-column  label="处罚意见" align="center" prop="punishmentopinion" min-width="140" /> 
+        <el-table-column  label="解决方案" align="center" prop="solutionContent" min-width="140" />
+        <el-table-column  label="处罚意见" align="center" prop="punishmentOpinion" min-width="140" /> 
         <el-table-column fixed="right" label="异常数量" align="center" prop="statisticAmount" min-width="140" />
         <el-table-column fixed="right" label="审核意见" align="center" prop="auditOpinion" min-width="120">
           <template #default="scope">