From d0d6fee4f52ba09259a78dafb485fd076c3611d2 Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Tue, 9 Jun 2026 17:50:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=92=8C=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/axios.js                           |  2 +-
 .../secondOrder/components/outDialog.vue      | 80 ++++++++++++++++++-
 2 files changed, 78 insertions(+), 4 deletions(-)

diff --git a/src/router/axios.js b/src/router/axios.js
index fb4bdf3..5d39005 100644
--- a/src/router/axios.js
+++ b/src/router/axios.js
@@ -50,7 +50,7 @@ axios.interceptors.request.use(config => {
   // config.url = config.url;
   // 发版打开下面注释
   if(config.url.indexOf('/smartpark') != -1){
-    if(config.url.indexOf('/AES/decryptAndGetUser') != -1){
+    if((config.url.indexOf('/AES/decryptAndGetUser') != -1)||(config.url.indexOf('/ld-person-form/upload') != -1)){
       config.url = config.url.replace('/smartparkAPP','http://atcflight.com:10094/6583e0b6-a422-4c74-aa40-df48e059b4de/lowDurableTest')
     }else{
       config.url = config.url.replace('/smartpark','http://atcflight.com:10094/6583e0b6-a422-4c74-aa40-df48e059b4de/lowDurableWebTestFront/smartpark')
diff --git a/src/views/secondOrder/components/outDialog.vue b/src/views/secondOrder/components/outDialog.vue
index d99960f..583ecaa 100644
--- a/src/views/secondOrder/components/outDialog.vue
+++ b/src/views/secondOrder/components/outDialog.vue
@@ -68,7 +68,76 @@
             </el-col>
           </el-row>
           <div class="form-title">{{ outDateInfo }} 出库信息：</div>
-          <div v-if="sizeForm.ldTwoOutStorage.groupName !== '自由出库'">
+          <div v-if="outDialogType == 'details'">
+            <el-button type="primary" size="mini" style="margin-bottom: 18px" @click="categoryHandle"
+              v-if="outDialogType != 'details'">新增</el-button>
+            <el-table :data="sizeForm.ldTwoOutStorageDetailList" border style="width: 100%" ref="table">
+              <el-table-column type="expand">
+                <template slot-scope="props">
+                  <el-table :data="scope.row.twoInventoryVOList" border style="width: 100%"
+                    v-if="scope.row.twoInventoryVOList">
+                    <el-table-column prop="materialName" label="物资名称"></el-table-column>
+                    <el-table-column prop="materialCode" label="物资编码"></el-table-column>
+                    <el-table-column prop="type" label="物资类型"></el-table-column>
+                    <el-table-column prop="num" label="数量"></el-table-column>
+                  </el-table>
+                </template>
+              </el-table-column>
+              <el-table-column prop="materialCode" label="物资编码">
+              </el-table-column>
+
+              <el-table-column prop="materialName" label="物资名称"></el-table-column>
+              <el-table-column prop="model" label="规格/型号">
+              </el-table-column>
+              <el-table-column prop="type" label="类别">
+                <template slot-scope="scope">
+                  {{
+                    scope.row.type === "NY"
+                      ? "耐用品"
+                      : scope.row.type === "YH"
+                        ? "易耗品"
+                        : ""
+                  }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="unit" label="单位"> </el-table-column>
+              <el-table-column label="实际使用人" prop="userInfo">
+                <template slot-scope="scope">
+                 <div v-if="outDialogType != 'details'">
+                   <el-select  v-model="scope.row.userInfo" placeholder="请选择" style="width: 100%" :disabled="sizeForm.departmentId == '' || outDialogType == 'details'
+                    " clearable filterable value-key="userId"
+                    @change="(val) => proposerChangeTable(val, scope.$index, 0)" v-if="scope.row.type == 'NY'">
+                    <el-option v-for="item in userOptions" :key="item.userId" :label="item.name" :value="item">
+                    </el-option>
+                  </el-select>
+                  <span v-else>-</span>
+                 </div>
+                 <div v-else>
+                  {{ scope.row.userName }}
+                 </div>
+                </template>
+              </el-table-column>
+              <el-table-column prop="num" label="数量">
+                <template slot-scope="scope">
+                  <el-input-number size="mini" v-model="scope.row.num" :min="0" :max="getMaxQuantity(scope.row)"
+                    style="width: 100%" :disabled="outDialogType != 'add' || scope.row.type === 'NY'
+                      " @change="
+                        (newValue) => handleQuantityChange(newValue, scope.$index)
+                      "></el-input-number>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" width="100" v-if="outDialogType != 'details'">
+                <template slot-scope="scope">
+                  <div :disabled="outDialogType == 'details'">
+                    <el-button type="text" size="mini" @click="handleDelete(scope.$index, scope.row)">
+                      删除
+                    </el-button>
+                  </div>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <div v-if="(sizeForm.ldTwoOutStorage.groupName !== '自由出库')&&(outDialogType != 'details')">
             <el-table :data="groupTableData" style="width: 100%" border ref="groupTable"
               @expand-change="handleExpandChange">
               <!-- 展开行详情 -->
@@ -127,7 +196,7 @@
             </el-table>
           </div>
 
-          <div v-if="sizeForm.ldTwoOutStorage.groupName == '自由出库'">
+          <div v-if="sizeForm.ldTwoOutStorage.groupName == '自由出库'&&(outDialogType != 'details')">
             <el-button type="primary" size="mini" style="margin-bottom: 18px" @click="categoryHandle"
               v-if="outDialogType != 'details'">新增</el-button>
             <el-table :data="sizeForm.ldTwoOutStorageDetailList" border style="width: 100%" ref="table">
@@ -162,13 +231,18 @@
               <el-table-column prop="unit" label="单位"> </el-table-column>
               <el-table-column label="实际使用人" prop="userInfo">
                 <template slot-scope="scope">
-                  <el-select v-model="scope.row.userInfo" placeholder="请选择" style="width: 100%" :disabled="sizeForm.departmentId == '' || outDialogType == 'details'
+                 <div v-if="outDialogType != 'details'">
+                   <el-select  v-model="scope.row.userInfo" placeholder="请选择" style="width: 100%" :disabled="sizeForm.departmentId == '' || outDialogType == 'details'
                     " clearable filterable value-key="userId"
                     @change="(val) => proposerChangeTable(val, scope.$index, 0)" v-if="scope.row.type == 'NY'">
                     <el-option v-for="item in userOptions" :key="item.userId" :label="item.name" :value="item">
                     </el-option>
                   </el-select>
                   <span v-else>-</span>
+                 </div>
+                 <div v-else>
+                  {{ scope.row.userName }}
+                 </div>
                 </template>
               </el-table-column>
               <el-table-column prop="num" label="数量">