From 2cba276c8826bffa95096370783a3dd544f7d11f Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Mon, 1 Apr 2024 10:52:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E7=A0=81=E7=9B=98=E7=82=B9=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/store/warehousing/putInStore.vue    | 48 +++++++++++--------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/sgzb-ui/src/views/store/warehousing/putInStore.vue b/sgzb-ui/src/views/store/warehousing/putInStore.vue
index 3169ccca..8e7860d6 100644
--- a/sgzb-ui/src/views/store/warehousing/putInStore.vue
+++ b/sgzb-ui/src/views/store/warehousing/putInStore.vue
@@ -157,7 +157,7 @@
     <el-dialog 
       :title="title" 
       :visible.sync="codeOpen" 
-      width="1450px" 
+      width="90%" 
       append-to-body 
       :show-close="false"
       :close-on-click-modal="false"
@@ -205,7 +205,7 @@
                 :min="1"
                 :max="99"
                 :controls="false"
-                style="width: 220px;"
+                style="width: 13vw;"
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
@@ -257,7 +257,7 @@
                 clearable
                 :min="0"
                 :controls="false"
-                style="width: 220px"
+                style="width: 13vw;"
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
@@ -283,23 +283,23 @@
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="检修时间" label-width="130px" prop="thisCheckFixTime">
+            <el-form-item label="检验时间" label-width="130px" prop="thisCheckFixTime">
               <el-date-picker
                 v-model="codeForm.thisCheckFixTime"
                 type="date"
-                placeholder="请输入检修时间"
+                placeholder="请输入检验时间"
                 style="width: 400px"
                 @keyup.enter.native="handleQuery">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="7">
-            <el-form-item label="下次检修时间" label-width="130px" prop="nextCheckFixTime">
+            <el-form-item label="下次检验时间" label-width="130px" prop="nextCheckFixTime">
               <el-date-picker
                 v-model="codeForm.nextCheckFixTime"
                 type="date"
-                placeholder="请输入检修时间"
-                style="width: 220px"
+                placeholder="请输入检验时间"
+                style="width: 13vw;"
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
@@ -307,8 +307,13 @@
         </el-row>
         
         <el-row :gutter="20">
-          
           <el-col :span="7">
+            <el-form-item label="检验人" label-width="130px" prop="checkMan">
+              <el-input v-model="codeForm.checkMan"  placeholder="请输入检验人" clearable style="width: 220px;" />
+            </el-form-item>
+          </el-col>
+          
+          <el-col :span="10">
             <el-form-item label="备注" label-width="130px" prop="remarks">
               <el-input
                 v-model="codeForm.remarks"
@@ -317,12 +322,12 @@
                 maxlength="200"
                 rows="4"
                 show-word-limit
-                style="width: 220px"
+                style="width: 400px"
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
           </el-col>
-          <el-col :span="10">
+          <el-col :span="7">
             <el-form-item style="margin-left: 200px;">
               <el-button type="primary" icon="el-icon-edit" size="mini" @click="fillCodeForm">点击填充</el-button>
               <!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> -->
@@ -385,24 +390,24 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column label="检修日期" align="center" prop="thisCheckFixTime" :show-overflow-tooltip="true">
+        <el-table-column label="检验日期" align="center" prop="thisCheckFixTime" :show-overflow-tooltip="true">
           <template v-slot:default="{ row }">
             <el-date-picker
               v-model="row.thisCheckFixTime"
               type="date"
-              placeholder="请输入检修时间"
-              style="width: 160px"
+              placeholder="请输入检验时间"
+              style="width: 170px"
               @keyup.enter.native="handleQuery"
             ></el-date-picker>
           </template>
         </el-table-column>
-        <el-table-column label="下次检修日期" align="center" prop="nextCheckFixTime" :show-overflow-tooltip="true">
+        <el-table-column label="下次检验日期" align="center" prop="nextCheckFixTime" :show-overflow-tooltip="true">
           <template v-slot:default="{ row }">
             <el-date-picker
               v-model="row.nextCheckFixTime"
               type="date"
-              placeholder="请输入下次检修时间"
-              style="width: 160px"
+              placeholder="请输入下次检验时间"
+              style="width: 170px"
               @keyup.enter.native="handleQuery"
             ></el-date-picker>
           </template>
@@ -556,6 +561,7 @@ export default {
       // 表单参数：编号表单 / 数量表单
       numberForm: {},
       codeForm: {
+        checkMan: undefined,
         putInType: undefined,
         remarks: undefined,
         typeId: undefined,
@@ -652,6 +658,7 @@ export default {
     // 编码表单重置
     resetCodeForm() {
       this.codeForm = {
+        checkMan: undefined,
         putInType: undefined,
         remarks: undefined,
         typeId: undefined,
@@ -691,10 +698,10 @@ export default {
           const outFacCode = ''
           // 生产厂家
           const maVender = this.supplierList.find(item => item.supplierId == this.codeForm.codeFactory)?.supplier || ''
-          // 检修日期: codeForm.thisCheckFixTime, 时间格式为 yyyy-MM-dd
+          // 检验日期: codeForm.thisCheckFixTime, 时间格式为 yyyy-MM-dd
           let thisCheckFixTime = new Date(this.codeForm.thisCheckFixTime).toLocaleDateString('zh-CN', {year: 'numeric', month: '2-digit', day: '2-digit'}).replace(/\//g, '-')
           if (thisCheckFixTime == 'Invalid Date') thisCheckFixTime = ''
-          // 下次检修日期: codeForm.nextCheckFixTime
+          // 下次检验日期: codeForm.nextCheckFixTime
           let nextCheckFixTime = new Date(this.codeForm.nextCheckFixTime).toLocaleDateString('zh-CN', {year: 'numeric', month: '2-digit', day: '2-digit'}).replace(/\//g, '-')
           if (nextCheckFixTime == 'Invalid Date') nextCheckFixTime = ''
           // 单价: codeForm.buyPrice
@@ -775,7 +782,8 @@ export default {
             typeId: this.codeForm.typeId,
             num: this.codeForm.num,
             remarks: this.codeForm.remarks || '',
-            machIneDtoList: this.codeTableList
+            machIneDtoList: this.codeTableList,
+            checkMan: this.codeForm.checkMan || '',
           }
           console.log('🚀 ~ submitForm: ~ SavePutInfoDto', SavePutInfoDto)