From 8eae9df04ffd3702401bc04503c4f89f6beb2596 Mon Sep 17 00:00:00 2001
From: zhangdi <15053473693@163.com>
Date: Tue, 30 Dec 2025 09:51:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=80=90=E7=94=A8=E5=93=81=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/materials/expend.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/materials/expend.vue b/src/views/materials/expend.vue
index 3ef8b67..a0e5e01 100644
--- a/src/views/materials/expend.vue
+++ b/src/views/materials/expend.vue
@@ -189,8 +189,8 @@ export default {
             prop: "isBorrow",
             headerAlign: "center",
             align: "center",
-             type: "select",
-            dicDta: [
+            type: "select",
+            dicData: [
               {
                 label: "已借出",
                 value: "0",

From 2a1e57afbddc951b0918c0795fa29b046d7a09bc Mon Sep 17 00:00:00 2001
From: zhangdi <15053473693@163.com>
Date: Tue, 30 Dec 2025 15:42:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E5=BA=93=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/secondOrder/outbound.js               |   2 +-
 src/views/materials/expend.vue                |   2 +-
 .../components/approvalProcessDialog.vue      |  56 ++++----
 .../secondOrder/components/outDialog.vue      | 121 +++++++++++++-----
 src/views/secondOrder/list.vue                |   2 +-
 src/views/secondOrder/outbound.vue            |  88 ++++++++-----
 6 files changed, 180 insertions(+), 91 deletions(-)

diff --git a/src/api/secondOrder/outbound.js b/src/api/secondOrder/outbound.js
index 7cba48d..d3c4142 100644
--- a/src/api/secondOrder/outbound.js
+++ b/src/api/secondOrder/outbound.js
@@ -50,7 +50,7 @@ export const submit = data => {
 // 获取详情
 export const getDetails = params => {
   return request({
-    url: '/smartpark/user/getUserByDeptId',
+    url: '/smartpark/twoOutStorage/detail',
     method: 'get',
     params: params,
 
diff --git a/src/views/materials/expend.vue b/src/views/materials/expend.vue
index a0e5e01..98e554f 100644
--- a/src/views/materials/expend.vue
+++ b/src/views/materials/expend.vue
@@ -104,7 +104,7 @@ export default {
         columnBtn: false,
         menuAlign: "left",
         searchMenuPosition: "right",
-        menuWidth: 140,
+        menuWidth: 100,
         column: [
           {
             label: "编号",
diff --git a/src/views/secondOrder/components/approvalProcessDialog.vue b/src/views/secondOrder/components/approvalProcessDialog.vue
index e63d21d..c1447b0 100644
--- a/src/views/secondOrder/components/approvalProcessDialog.vue
+++ b/src/views/secondOrder/components/approvalProcessDialog.vue
@@ -11,8 +11,8 @@
       <el-steps class="teps-con" direction="vertical" :active="1">
         <el-step
           v-for="(item, index) in approvalList"
-          :title="item.name"
-          :description="item.time || ''"
+          :title="item.userName"
+          :description="item.optTime || ''"
         ></el-step>
       </el-steps>
       <!-- <span slot="footer" class="dialog-footer">
@@ -22,47 +22,53 @@
   </div>
 </template>
 <script>
-import {
-  getAllQuarter,
-  getPurchasesByIds,
-  getMaterialList,
-  getDetailList,
-} from "@/api/firstOrder/inbound";
+import { getDetails } from "@/api/secondOrder/outbound";
 export default {
   props: {
     showDialog: {
       type: Boolean,
       default: false,
     },
+    rowData: {
+      type: Object,
+      default: {},
+    },
   },
   data() {
     return {
       inDialogVisible: false,
       inDialogTiltle: "审批流程",
       approvalList: [
-        {
-          name: "张三",
-          time: "2021-01-01 10:10:10",
-          status: "通过",
-        },
-        {
-          name: "张三1",
-          time: "",
-          status: "待审核",
-        },
-        {
-          name: "张三3",
-          time: "",
-          status: "待审核",
-        },
+        // {
+        //   name: "张三",
+        //   time: "2021-01-01 10:10:10",
+        //   status: "通过",
+        // },
+        // {
+        //   name: "张三1",
+        //   time: "",
+        //   status: "待审核",
+        // },
+        // {
+        //   name: "张三3",
+        //   time: "",
+        //   status: "待审核",
+        // },
       ],
     };
   },
 
   mounted() {
     this.inDialogVisible = this.showDialog;
+    this.inInit();
   },
   methods: {
+    inInit() {
+      getDetails({ twoOutStorageId: this.rowData.id }).then((res) => {
+        console.log(9999, res);
+        this.approvalList = res.data.result.approveList;
+      });
+    },
     handleCloseDetail() {
       this.inDialogVisible = false;
       this.$emit("closeDialog");
@@ -76,8 +82,8 @@ export default {
   font-weight: 600;
   padding: 18px 0;
 }
-.teps-con{
-  margin:0 auto 0
+.teps-con {
+  margin: 0 auto 0;
 }
 :deep(.el-dialog__body) {
   height: 300px;
diff --git a/src/views/secondOrder/components/outDialog.vue b/src/views/secondOrder/components/outDialog.vue
index 3e5e7a6..ca96a85 100644
--- a/src/views/secondOrder/components/outDialog.vue
+++ b/src/views/secondOrder/components/outDialog.vue
@@ -15,7 +15,7 @@
           ref="dynamicValidateForm"
           label-width="100px"
           class="demo-dynamic"
-          :rules="rules"
+          :rules="dynamicRules"
         >
           <div class="form-title">基本信息</div>
           <el-row>
@@ -83,7 +83,9 @@
                   v-model="sizeForm.ldTwoOutStorage.proposerInfo"
                   placeholder="请选择"
                   style="width: 100%"
-                  :disabled="sizeForm.departmentId == ''"
+                  :disabled="
+                    sizeForm.departmentId == '' || outDialogType == 'details'
+                  "
                   clearable
                   filterable
                   value-key="userId"
@@ -102,7 +104,7 @@
             <el-col :span="12" v-if="outDialogType == 'details'">
               <el-form-item label="填报人">
                 <el-input
-                  v-model="sizeForm.ldTwoOutStorage.submitName"
+                  v-model="sizeForm.ldTwoOutStorage.shipperName"
                   :disabled="outDialogType != 'add'"
                 ></el-input>
               </el-form-item>
@@ -114,6 +116,7 @@
             size="mini"
             style="margin-bottom: 18px"
             @click="inTableAdd()"
+            v-if="outDialogType != 'details'"
             >新增</el-button
           >
           <el-table
@@ -157,44 +160,35 @@
                   :min="1"
                   style="width: 100%"
                   :disabled="outDialogType != 'add'"
+                  @change="(newValue) => handleQuantityChange(newValue, scope.$index)"
                 ></el-input-number>
               </template>
             </el-table-column>
           </el-table>
-          <div class="form-title">出库账目表格：</div>
+          <div class="form-title" v-if="outDialogType != 'details'">
+            出库账目表格：
+          </div>
           <el-table
             :data="sizeForm.inAccountsTableData"
             border
             style="width: 100%"
+            v-if="outDialogType != 'details'"
           >
             <el-table-column prop="date" label="当前库存">
-              <el-table-column prop="str1" label="编码"> </el-table-column>
-              <el-table-column prop="str2" label="名称">
-                <template slot-scope="scope">
-                  <el-select
-                    v-model="sizeForm.type"
-                    placeholder="请选择"
-                    style="width: 100%"
-                    :disabled="outDialogType != 'add'"
-                  >
-                    <el-option label="办公室物资" value="1"></el-option>
-                    <el-option label="其他物资" value="2"></el-option>
-                  </el-select>
-                </template>
+              <el-table-column prop="materialCode" label="编码">
+              </el-table-column>
+              <el-table-column prop="materialName" label="名称">
               </el-table-column>
-              <el-table-column prop="str3" label="规格"> </el-table-column>
-              <el-table-column prop="str4" label="类别"> </el-table-column>
-              <el-table-column prop="str5" label="单位"> </el-table-column>
-              <el-table-column prop="str6" label="数量"> </el-table-column>
-              <el-table-column prop="num" label="单价"> </el-table-column>
+              <el-table-column prop="model" label="规格"> </el-table-column>
+              <el-table-column prop="type" label="类别"> </el-table-column>
+              <el-table-column prop="unit" label="单位"> </el-table-column>
+              <el-table-column prop="oldNum" label="数量"> </el-table-column>
             </el-table-column>
             <el-table-column prop="date" label="出库信息">
-              <el-table-column prop="str8" label="数量"> </el-table-column>
-              <el-table-column prop="str9" label="单价"> </el-table-column>
+              <el-table-column prop="num" label="数量"> </el-table-column>
             </el-table-column>
             <el-table-column prop="date" label="出库后库存">
-              <el-table-column prop="str10" label="数量"> </el-table-column>
-              <el-table-column prop="str11" label="单价"> </el-table-column>
+              <el-table-column prop="newNum" label="数量"> </el-table-column>
             </el-table-column>
           </el-table>
         </el-form>
@@ -202,7 +196,12 @@
 
       <span slot="footer" class="dialog-footer">
         <el-button @click="handleCloseDetail()">取 消</el-button>
-        <el-button type="primary" @click="sumbit()">确 定</el-button>
+        <el-button
+          v-if="outDialogType != 'details'"
+          type="primary"
+          @click="sumbit()"
+          >确 定</el-button
+        >
       </span>
     </el-dialog>
   </div>
@@ -213,6 +212,7 @@ import {
   getUserList,
   getMaterialList,
   submit,
+  getDetails,
 } from "@/api/secondOrder/outbound";
 export default {
   props: {
@@ -232,6 +232,10 @@ export default {
       type: String,
       default: "",
     },
+    rowData: {
+      type: Object,
+      default: {},
+    },
   },
   computed: {
     outDateInfo() {
@@ -242,6 +246,18 @@ export default {
       return `${year}年${month}月${day}日`;
     },
   },
+  watch: {
+    outDialogType: {
+      immediate: true,
+      handler(newVal) {
+        if (newVal === "details") {
+          this.dynamicRules = {}; // 清空校验规则
+        } else {
+          this.dynamicRules = this.rules; // 恢复校验规则
+        }
+      },
+    },
+  },
   data() {
     return {
       outDialogVisible: false,
@@ -305,6 +321,7 @@ export default {
       materials: [], //物资列表
       userOptions: [], //领用人列表
       departmentOptions: [], //部门列表
+      dynamicRules: {}, // 动态校验规则
     };
   },
   mounted() {
@@ -318,6 +335,24 @@ export default {
     this.getDetailedItems();
   },
   methods: {
+    // 初始化  汇总库存 inAccountsTableData
+    summaryTableData() {
+      this.sizeForm.inAccountsTableData = JSON.parse(JSON.stringify(this.sizeForm.ldTwoOutStorageDetailList))
+    },
+    handleQuantityChange(newValue, index) {
+      const currentRow = this.sizeForm.ldTwoOutStorageDetailList[index];
+      if (currentRow.materialCode != '') {
+        currentRow.oldNum =  currentRow.materialitem.num
+        currentRow.num =  currentRow.num
+        currentRow.newNum =  currentRow.materialitem.num - currentRow.num
+      }
+      this.$set(this.sizeForm.inAccountsTableData,index,currentRow)
+      this.sizeForm.inAccountsTableData[index] = currentRow
+    },
+    // 更新全局总计
+    updateGlobalTotal() {
+      let totalAmount = 0;
+    },
     //获取单条选择的物资名称列表
     async getMaterialList(value) {
       getMaterialList({ departmentId: value }).then((res) => {
@@ -326,6 +361,7 @@ export default {
     },
     // 选中物资获取数据
     handleMaterialChange(row, index) {
+      console.log(99999,row)
       this.sizeForm.ldTwoOutStorageDetailList[index].materialId =
         row.materialId;
       this.sizeForm.ldTwoOutStorageDetailList[index].model = row.model;
@@ -335,11 +371,20 @@ export default {
         row.materialName;
       this.sizeForm.ldTwoOutStorageDetailList[index].type = row.type;
       this.sizeForm.ldTwoOutStorageDetailList[index].unit = row.unit;
+
+
     },
     // 获取领用人列表
     getUserList(value) {
       getUserList({ departmentId: value }).then((res) => {
         this.userOptions = res.data.result;
+        if (this.outDialogType != "add") {
+          let userArr = this.userOptions.filter(
+            (item) => item.userId == this.sizeForm.ldTwoOutStorage.proposerId
+          );
+          this.sizeForm.ldTwoOutStorage.proposerInfo =
+            userArr.length > 0 ? userArr[0] : {};
+        }
       });
     },
     // 获取部门列表
@@ -358,7 +403,7 @@ export default {
     },
     // 领用人选中
     proposerChange(value) {
-      console.log('领用人',value);
+      console.log("领用人", value);
       this.sizeForm.ldTwoOutStorage.proposerId = value.userId;
       this.sizeForm.ldTwoOutStorage.proposerName = value.name;
     },
@@ -366,7 +411,24 @@ export default {
       this.outDialogVisible = false;
       this.$emit("handleCloseDetail");
     },
-    inInit() {},
+    inInit() {
+      if (this.outDialogType != "add") {
+        getDetails({ twoOutStorageId: this.rowData.id }).then((res) => {
+          this.sizeForm = res.data.result;
+          this.getUserList(this.sizeForm.ldTwoOutStorage.departmentId);
+
+          let departmentArr = this.departmentOptions.filter(
+            (item) =>
+              item.departmentId == this.sizeForm.ldTwoOutStorage.departmentId
+          );
+
+          this.sizeForm.ldTwoOutStorage.departmentInfo =
+            departmentArr.length > 0 ? departmentArr[0] : {};
+
+          // this.sizeForm.ldTwoOutStorage.proposerInfo={}
+        });
+      }
+    },
 
     addInit() {
       const now = new Date();
@@ -382,6 +444,7 @@ export default {
     // 添加入库数据
     inTableAdd() {
       this.sizeForm.ldTwoOutStorageDetailList.push({});
+      this.summaryTableData()
     },
     // 提交
     sumbit() {
diff --git a/src/views/secondOrder/list.vue b/src/views/secondOrder/list.vue
index cc12270..1e5d7e1 100644
--- a/src/views/secondOrder/list.vue
+++ b/src/views/secondOrder/list.vue
@@ -78,7 +78,7 @@ export default {
         columnBtn: false,
         menuAlign: "left",
         searchMenuPosition: "right",
-        menuWidth: 100,
+        menuWidth: 80,
         column: [
           {
             label: "部门",
diff --git a/src/views/secondOrder/outbound.vue b/src/views/secondOrder/outbound.vue
index 085ecb7..92c564e 100644
--- a/src/views/secondOrder/outbound.vue
+++ b/src/views/secondOrder/outbound.vue
@@ -21,10 +21,12 @@
         </el-button>
       </template>
       <template #menu="scope">
-         <el-button type="text" @click.stop="approvalProcessFn(scope.row)"
+        <el-button type="text" @click.stop="approvalProcessFn(scope.row)"
           >审批流程</el-button
         >
-        <el-button type="text" @click.stop="handleDetails(scope.row)">详情</el-button>
+        <el-button type="text" @click.stop="handleDetails(scope.row)"
+          >详情</el-button
+        >
       </template>
       <template slot-scope="scope" slot="xuqiudanmingcheng">
         <el-button
@@ -42,6 +44,7 @@
       :repairVisible="outDialogVisible"
       :outDialogTiltle="outDialogTiltle"
       :outDialogType="outDialogType"
+      :rowData="rowData"
       @handleCloseDetail="handleCloseDetail"
       type="二级库"
     >
@@ -59,6 +62,7 @@
     <approvalProcessDialog
       :showDialog="approvalProcessShow"
       v-if="approvalProcessShow"
+      :rowData="rowData"
       @closeDialog="closeDialog"
     ></approvalProcessDialog>
   </basic-container>
@@ -74,7 +78,7 @@ export default {
   components: {
     outDialog,
     needDialog,
-    approvalProcessDialog
+    approvalProcessDialog,
   },
   data() {
     return {
@@ -120,23 +124,8 @@ export default {
         menuAlign: "left",
         searchMenuPosition: "right",
         excelBtn: true,
-        menuWidth:140,
+        menuWidth: 140,
         column: [
-          //  {
-          //   label: "需求单名称",
-          //   prop: "xuqiudanmingcheng",
-          //   width:180,
-          // },
-          {
-            label: "部门",
-            prop: "bumen",
-            headerAlign: "center",
-            align: "center",
-          },
-          // {
-          //   label: "仓库类型",
-          //   prop: "str1",
-          // },
           {
             label: "出库单号",
             prop: "orderNo",
@@ -151,13 +140,41 @@ export default {
             headerAlign: "center",
             align: "center",
           },
-
-          // {
-          //   label: "审批人",
-          //   prop: "approvers",
-          //   headerAlign: "center",
-          //   align: "center",
-          // },
+          {
+            label: "事由",
+            prop: "reason",
+            headerAlign: "center",
+            align: "center",
+          },
+          {
+            label: "物资类型",
+            prop: "materialType",
+            headerAlign: "center",
+            align: "center",
+            type: "select",
+            dicData: [
+              {
+                label: "办公物资",
+                value: "1",
+              },
+              {
+                label: "其他物资",
+                value: "2",
+              },
+            ],
+          },
+          {
+            label: "部门",
+            prop: "department",
+            align: "center",
+            headerAlign: "center",
+          },
+          {
+            label: "出库人",
+            prop: "shipperName",
+            headerAlign: "center",
+            align: "center",
+          },
 
           {
             label: "状态",
@@ -169,7 +186,7 @@ export default {
             dicData: [
               {
                 label: "未出库",
-                value:0,
+                value: 0,
               },
               {
                 label: "已出库",
@@ -187,21 +204,23 @@ export default {
       outDialogVisible: false,
       outDialogTiltle: "出库",
       outDialogType: "",
-      approvalProcessShow:false,
+      approvalProcessShow: false,
+      rowData:{},
     };
   },
 
   methods: {
     approvalProcessFn(row) {
       this.approvalProcessShow = true;
+      this.rowData = row
     },
-     // 详情
+    // 详情
     handleDetails(row) {
-      this.outDialogVisible = true
-      this.outDialogType = 'details'
-      this.outDialogTiltle = '详情'
-      this.id = row.id
-      console.log(this.id,'id')
+      this.outDialogVisible = true;
+      this.outDialogType = "details";
+      this.outDialogTiltle = "详情";
+      this.rowData = row
+
     },
     purchaseFn(row) {
       this.purchaseOpen = true;
@@ -209,6 +228,7 @@ export default {
     },
     closeDialog() {
       this.purchaseOpen = false;
+      this.approvalProcessShow = false
     },
     handleDesign() {
       this.outDialogVisible = true;