From 5f8b6c6b9039510ccdb21198d876983250158d89 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Thu, 7 Nov 2024 11:07:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=BA=86=E9=9C=80=E6=B1=82=E6=95=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../secondStore/secondStore.vue               |  4 ++--
 .../claimAndreturn/picking/outbound/index.vue | 19 +++++++++++++++++--
 src/views/repairTest/repair/dialogOneForm.vue |  2 +-
 src/views/stquery/deviceStatusRecord.vue      |  8 +++++++-
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/views/claimAndRefund/secondStore/secondStore.vue b/src/views/claimAndRefund/secondStore/secondStore.vue
index 07b8870..ded4461 100644
--- a/src/views/claimAndRefund/secondStore/secondStore.vue
+++ b/src/views/claimAndRefund/secondStore/secondStore.vue
@@ -4,9 +4,9 @@
             <div :class="[{ clicked: leaseType == 1 }]" @click="toggleBtn(1)">
                 长期领用
             </div>
-            <div :class="[{ clicked: leaseType == 0 }]" @click="toggleBtn(0)">
+<!--            <div :class="[{ clicked: leaseType == 0 }]" @click="toggleBtn(0)">
                 工程领用
-            </div>
+            </div>-->
         </div>
         <el-form
             :model="queryParams"
diff --git a/src/views/claimAndreturn/picking/outbound/index.vue b/src/views/claimAndreturn/picking/outbound/index.vue
index d6591d5..d9dbb44 100644
--- a/src/views/claimAndreturn/picking/outbound/index.vue
+++ b/src/views/claimAndreturn/picking/outbound/index.vue
@@ -423,12 +423,18 @@
                 label-width="100px"
             >
                 <span style="margin-right: 50px">待出库数量：{{ outNum }}</span>
+                <br> <br>
                 <el-form-item label="请输入车牌号" prop="carCode">
                     <el-input v-model="codeOutForm.carCode" maxlength="20" />
                 </el-form-item>
                 <span style="margin-right: 50px; color: red"
-                    >部分设备出库时，需进行装车,需记录车牌号码</span
+                >部分设备出库时，需进行装车,需记录车牌号码</span
                 >
+                <br>
+                <el-form-item label="备注" prop="remark">
+                  <el-input v-model="codeOutForm.remark" maxlength="50" />
+                </el-form-item>
+
             </el-form>
 
             <el-form
@@ -547,8 +553,13 @@
                     <el-input v-model="numOutForm.carCode" maxlength="20" />
                 </el-form-item>
                 <span style="margin-right: 50px; color: red"
-                    >部分设备出库时，需进行装车,需记录车牌号码</span
+                >部分设备出库时，需进行装车,需记录车牌号码</span
                 >
+                <br>
+                <el-form-item label="备注" prop="remark">
+                  <el-input v-model="numOutForm.remark" maxlength="50" />
+                </el-form-item>
+
             </el-form>
             <el-row :gutter="10" class="mb8">
                 <el-col :span="1.5">
@@ -683,10 +694,12 @@ export default {
             codeOutForm: {
                 //编码表单-车牌号
                 carCode: undefined,
+                remark: undefined,
             },
             numOutForm: {
                 //数量表单-车牌号
                 carCode: '',
+                remark: '',
             },
             outQuery: {
                 //编码出库-搜索条件
@@ -889,6 +902,7 @@ export default {
                         maId: item,
                         manageType: 0,
                         carCode: this.codeOutForm.carCode,
+                        remark: this.codeOutForm.remark,
                         typeId: this.outObj.typeId,
                         parentId: this.outObj.parentId,
                         outNum: 1,
@@ -913,6 +927,7 @@ export default {
         //数量出库保存
         saveNumOut() {
             this.outNumList[0].carCode = this.numOutForm.carCode
+            this.outNumList[0].remark = this.numOutForm.remark
             this.outNumList[0].leaseType = this.leaseType
             let param = this.outNumList
             // console.log(param, '数量出库时参数')
diff --git a/src/views/repairTest/repair/dialogOneForm.vue b/src/views/repairTest/repair/dialogOneForm.vue
index 0ddbc2c..9e3e2d3 100644
--- a/src/views/repairTest/repair/dialogOneForm.vue
+++ b/src/views/repairTest/repair/dialogOneForm.vue
@@ -83,7 +83,7 @@
                             :prop="'premiumList.' + index + '.partNum'"
                             label="配件数量："
                             :rules="{
-                                required: isRequired,
+                                required: domain.partId,
                                 validator: numberIntegerValidator,
                                 trigger: 'blur',
                             }"
diff --git a/src/views/stquery/deviceStatusRecord.vue b/src/views/stquery/deviceStatusRecord.vue
index eefdea6..303d8d0 100644
--- a/src/views/stquery/deviceStatusRecord.vue
+++ b/src/views/stquery/deviceStatusRecord.vue
@@ -108,7 +108,7 @@
         </el-form>
 
         <!-- <el-col :span="1.5">
-        
+
       </el-col> -->
 
         <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
@@ -159,6 +159,12 @@
                 prop="num"
                 :show-overflow-tooltip="true"
             />
+            <el-table-column
+              label="待出库数量"
+              align="center"
+              prop="preOutNum"
+              :show-overflow-tooltip="true"
+            />
             <el-table-column
                 label="在用数量"
                 align="center"