代码提交

src/api/firstOrder/outbound.js

@@ -87,8 +87,9 @@ export const editList = (oneOutStorageId) => {
     })
 }
 export const getPutPurchaseList = (current, size, params) => {
+    console.log('api中的数据', params)
     return request({
-        url: '/smartpark/oneOutStorageDetail/getOneOutStorageDetailList',
+        url: '/smartpark/oneOutStorage/getDemandEndList',
         method: 'get',
         params: {
             ...params,

src/views/firstOrder/components/batchSelectionDialog.vue

@@ -1,25 +1,13 @@
 <template>
-    <el-dialog 
+    <el-dialog :close-on-click-modal="false" :title="batchSelectionTitle" :visible.sync="batchSelectionVisible"
-        :close-on-click-modal="false" 
+        :append-to-body="true" width="70%" @close="handleCloseDetail" fullscreen>
-        :title="batchSelectionTitle" 
-        :visible.sync="batchSelectionVisible"
-        :append-to-body="true" 
-        width="70%" 
-        @close="handleCloseDetail" 
-        fullscreen
-    >
         <el-table :data="tableData" style="width: 100%" border>
             <!-- 展开行详情 -->
             <el-table-column type="expand">
                 <template slot-scope="props">
                     <!-- 关联表单列表（带复选框） -->
-                    <el-table 
+                    <el-table :data="props.row.oneFormList || []" size="mini" style="width: 100%"
-                        :data="props.row.oneFormList || []" 
+                        @selection-change="(val) => handleSelectionChange(val, props.row)" border>
-                        size="mini" 
-                        style="width: 100%"
-                        @selection-change="(val) => handleSelectionChange(val, props.row)"
-                        border
-                    >
                         <el-table-column type="selection" width="55" />
                         <el-table-column type="index" label="#" width="55" />
                         <!-- <el-table-column label="表单ID" prop="id" width="80" /> -->
@@ -44,7 +32,8 @@
             <el-table-column label="单位" prop="unit" />
         </el-table>
         <div style="text-align: right; margin-top: 20px">
-            <el-button @click="handleConfirmSelect">确认选择</el-button>
+            <el-button @click="handleCloseDetail">取消</el-button>
+            <el-button @click="handleConfirmSelect" type="primary">确认选择</el-button>
         </div>
     </el-dialog>
 </template>

src/views/firstOrder/components/consumableDialog.vue

@@ -40,11 +40,12 @@ export default {
                 total: 0,
             },
             option: {
+                reserveSelection: true,
                 // height: "auto",
                 calcHeight: 30,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 12,
+                searchMenuSpan: 18,
                 border: true,
                 index: true,
                 selection: true,
@@ -176,17 +177,6 @@ export default {
         this.consumableVisible = this.consumableVisible
     },
     methods: {
-        formatTime(row, column, cellValue) {
-            if (!cellValue) return '';
-            const date = new Date(cellValue);
-            const year = date.getFullYear();
-            const month = String(date.getMonth() + 1).padStart(2, '0');
-            const day = String(date.getDate()).padStart(2, '0');
-            const hours = String(date.getHours()).padStart(2, '0');
-            const minutes = String(date.getMinutes()).padStart(2, '0');
-            const seconds = String(date.getSeconds()).padStart(2, '0');
-            return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-        },
         async handleLog(row) {
             this.dialogLogVisible = true;
             this.currentRow = row;
@@ -229,7 +219,6 @@ export default {
             this.query = {};
             this.onLoad(this.page);
         },
-        
         searchChange(params, done) {
             this.query = params;
             this.page.currentPage = 1;
@@ -274,8 +263,7 @@ export default {
         },
 
         handleRowChange(row, index, data) {
-            // 这个方法应该只处理行变化，分页勾选保持应该在 onLoad 中处理
+ 
-            // 但为了保持当前页面勾选状态，我们保留此逻辑
             this.$nextTick(() => {
                 // 设置标志，表示正在程序化更新选择状态
                 this.isUpdatingSelection = true;
@@ -371,7 +359,8 @@ export default {
         },
 
         handleCancel() {
-            this.$emit('handleCloseDetail');
+            // this.$emit('handleCloseDetail');
+            this.consumableVisible 
         }
     },
 }

src/views/firstOrder/components/needDialog.vue

@@ -44,7 +44,7 @@ export default {
             prop: 'materialName'
           }, {
             label: '计划需求数量',
-            prop: 'requiredQuantity'
+            prop: 'applicationQuantity'
           }, {
             label: '已出库数量',
             prop: 'outboundQuantity'
@@ -55,7 +55,6 @@ export default {
   },
   mounted() {
     this.openShow = this.showDialog
-
   },
   methods: {
     closeDialog() {
@@ -74,7 +73,7 @@ export default {
     onLoad(page, params = {}) {
       this.loading = true;
       const queryParams = Object.assign(params, this.query, {
-        onePutStorageId: this.id
+        oneOutStorageId: this.id
       });
       getPutPurchaseList(page.currentPage, page.pageSize, queryParams).then(res => {
         console.log('采购单列表', res.data.result)

src/views/firstOrder/components/outDialog.vue

@@ -66,7 +66,7 @@
               <template slot-scope="scope">
                 <el-select v-model="scope.row.materialitem" placeholder="请选择物资名称" style="width: 100%;"
                   @change="handleMaterialChange(scope.row.materialitem, scope.$index)"
-                  v-if='inDialogType != "details" && sizeForm.options == 2 && sizeForm.optionType == "YH"'
+                  v-if='outDialogType != "details" && sizeForm.options == 2 && sizeForm.optionType == "YH"'
                   value-key="id">
                   <el-option v-for="item in materials" :key="item.materialId" :label="item.materialName" :value="item">
                   </el-option>
@@ -276,10 +276,8 @@ export default {
   data() {
     return {
       dialogVisible: false,
-      materialList: [],
       demandDialogTitle: '耐用品出库',
       batchSelectionTitle: '耐用品出库',
-      goodsVisible: false,
       batchSelectionVisible: false,
       batchSelection: true, // 保持组件渲染
       batchTableData: [],
@@ -308,8 +306,6 @@ export default {
           mainErDepartmentName: "主管部门名称",
         },
       },
-      goodsList: [],
-      goodsSelectList: [],
       // inTableData: [],
       inBatchDialogVisible: false,//选择采购单的数据
       batchType: '',//需求单选择类型
@@ -358,14 +354,7 @@ export default {
       this.consumableVisible = false
       this.sizeForm.inTableData = allSelectedList
       console.log(this.sizeForm.inTableData, '111220')
-    },
+    },    // 处理搜索
-    // // 获取物资列表
-    // async getMaterialList() {
-    //   const { data: res } = await this.$http.get('material/getMaterialList')
-    //   if (res.code !== 200) return this.$message.error(res.msg)
-    //   this.materialList = res.data
-    // },
-    // 处理搜索
     async handleSearch() {
       // 重置当前页
       this.currentPage = 1;
@@ -384,50 +373,6 @@ export default {
       this.currentPage = val;
       this.loadGoodsList();
     },
-    // 加载商品列表数据（包含分页和搜索）
-    // async loadGoodsList() {
-    //   try {
-    //     const res = await getMaterialList({
-    //       optionType: 'NY', // 耐用品
-    //       // pageNum: this.currentPage,
-    //       // pageSize: this.pageSize,
-    //       // keyword: this.searchKeyword // 搜索关键词
-    //     });
-
-    //     if (res.data && res.data.result) {
-    //       // this.goodsList = res.data.result.list; // 列表数据
-    //       this.goodsList = res.data.result; // 列表数据
-    //       this.total = res.data.result.total; // 总条数
-    //     }
-    //   } catch (error) {
-    //     this.$message.error("获取商品列表失败，请重试");
-    //   }
-    // },
-    // 选择变化时保存到数组
-    goodsListSelectionChange(val) {
-      this.goodsSelectList = JSON.parse(JSON.stringify(val));
-    },
-    // 批量选择耐用品弹窗确认选择
-    // goodsSubmit() {
-    //   if (this.goodsSelectList.length > 0) {
-    //     const newItems = this.goodsSelectList.map(item => ({
-    //       ...item,
-    //       materialId: item.materialId,
-    //       materialCode: item.materialCode,
-    //       materialName: item.materialName,
-    //       model: item.model,
-    //       type: item.type,
-    //       unit: item.unit,
-    //       department: item.departmentId,
-    //       departmentName: item.departmentName,
-    //       theOutboundQuantity: 0
-    //     }));
-    //     this.sizeForm.inTableData.push(...newItems);
-    //     this.batchSelectionVisible = true;
-    //   } else {
-    //     this.$message.warning('请先勾选需要添加的数据')
-    //   }
-    // },
     depchange(value) {
       this.departmentList = this.departmentList
     },
@@ -518,57 +463,7 @@ export default {
         this.departmentList = []
       }
     },
-    //批量选择弹窗确定
-    // async batchSubmit() {
-    //   if (!this.inBatchForm.batchType) {
-    //     this.$message.error('请选择需求单');
-    //     return;
-    //   }
-    //   if (!this.inBatchForm.department) {
-    //     this.$message.error('请选择部门');
-    //     return;
-    //   }
-    //   if (!this.inBatchForm.optionType) {
-    //     this.$message.error('请选择类别');
-    //     return;
-    //   }
-    //   const res = await getDetailedList({
-    //     ids: this.inBatchForm.batchType,
-    //     departmentId: this.inBatchForm.department,
-    //     optionType: this.inBatchForm.optionType,
-    //   })
-
-    //   if (res.data && res.data.result) {
-    //     this.sizeForm.inTableData = res.data.result
-    //     const selectedDept = this.departmentList.find(
-    //       dept => dept.departmentId === this.inBatchForm.department
-    //     )
-    //     const deptName = selectedDept ? selectedDept.department : '';
-    //     this.sizeForm.inTableData = res.data.result.map(item => ({
-    //       ...item,
-    //       IdDemandEndld: this.inBatchForm.batchType,
-    //       // department: this.inBatchForm.department,
-    //       department: deptName
-    //     }))
-    //     this.inBatchDialogVisible = false;
-    //     const selectedQuarter = this.quarterList.find(
-    //       item => item.ids === this.inBatchForm.batchType
-    //     )
-    //     if (selectedQuarter) {
-    //       this.sizeForm.demandEndInfo = selectedQuarter.quarterName;
-    //     }
-    //     if (this.inBatchForm.optionType === 'NY') {
-    //       this.batchSelectionVisible = true;
-    //       this.batchTableData = res.data.result;
-    //     }
-    //     this.$nextTick(() => {
-    //       this.$forceUpdate();
-    //     })
-    //   } else {
-    //     this.$message.warning('未获取到详细数据');
-    //   }
 
-    // },
     async batchSubmit() {
       if (!this.inBatchForm.batchType) {
         this.$message.error('请选择需求单');
@@ -642,20 +537,6 @@ export default {
         console.error('批量提交接口调用失败：', error);
       }
     },
-    //批量选择耐用品选择回调函数
-    goodsListSelectionChange(val) {
-      this.goodsSelectList = val
-    },
-    //批量选择耐用品弹窗点击确认按钮
-    // goodsSubmit() {
-    //   if (this.goodsSelectList.length > 0) {
-    //     this.sizeForm.inTableData.push(...this.goodsSelectList);
-    //     this.$forceUpdate();
-    //   } else {
-    //     this.$message.warning('请先勾选需要添加的数据');
-    //   }
-    //   this.batchSelectionVisible = true;
-    // },
     //获取单条选择的部门名称列表
     async getDetailedItems() {
       this.loading = true
@@ -675,10 +556,9 @@ export default {
     //获取单条选择的物资名称列表
     async getMaterialList() {
       this.loading = true
-      this.goodsVisible = false;
       this.consumableVisible = false;
       try {
-        if (this.sizeForm.optionType === "NY") {
+        if (this.sizeForm.optionType === "NY" && this.outDialogType !== 'details') {
           this.consumableVisible = true
         } else {
           const res = await getMaterialList({ optionType: this.sizeForm.optionType })
@@ -778,60 +658,46 @@ export default {
           this.sizeForm.demandEndInfo = ldOneOutStorage.demandEndInfo
           this.sizeForm.outDate = ldOneOutStorage.outDate
           this.sizeForm.options = Number(ldOneOutStorage.options)
-          // this.sizeForm.optionType = ldOneOutStorage.optionType
+          this.sizeForm.optionType = ldOneOutStorage.optionType
-          // reason: '',//事由
-          // inAccountsTableData: [],//总计
-          // inTableData: [],
-          // ldOneOutStorageDetailVOList: [],
-          // demandEndInfo: '',//需求单名称
-          // outDate: '',//出库时间
-          // options: 2,//出库类型
-          // optionType: '', // 1易耗品 2耐用品
-          // materialType: '1',//物资类型
-          // status: '',//1暂存 2提交
-          // materialld: '',//物资Id
           this.$set(this.sizeForm, 'inTableData', res.data.result.ldOneOutStorageDetails)
           console.log(this.sizeForm, '111')
         })
       }
     },
-    // this.sizeForm = {
+    //  async inInit() {
-    //   // ...this.sizeForm,
+    //     if (this.outDialogType == 'details' || this.outDialogType == 'edit') {
-    //   // ...ldOneOutStorage,
-    //   // outDate: ldOneOutStorage.outDate ? new Date(ldOneOutStorage.outDate) : '',
-    //   // options: Number(ldOneOutStorage.options) || 1,
-    //   // inTableData: ldOneOutStorageDetails
-    // }
-    // })
     //       try {
-    //   const res = await editList(this.id)
+    //         const res = await editList(this.id);
-    //   console.log(res, '详情数据')
     //         const { ldOneOutStorage, ldOneOutStorageDetails = [] } = res.data.result || {};
     //         if (!ldOneOutStorage) {
     //           this.$message.error("回显数据异常");
     //           return;
     //         }
-    //   // const handledDetailList = ldOneOutStorageDetails.map(item => ({
+    //         const handledDetailList = ldOneOutStorageDetails.map(item => ({
-    //   //   ...item,
+    //           ...item,
-    //   //   outboundQuantity: item.outboundQuantity || 0
+    //           outboundQuantity: item.outboundQuantity || 0
-    //   // }))
+    //         }))
-    //   console.log(handledDetailList, 'handledDetailList')
     //         this.sizeForm = {
     //           ...this.sizeForm,
     //           ...ldOneOutStorage,
     //           outDate: ldOneOutStorage.outDate ? new Date(ldOneOutStorage.outDate) : '',
     //           options: Number(ldOneOutStorage.options) || 1,
-    //   inTableData: ldOneOutStorageDetails
     //         }
-    //   // console.log(this.sizeForm.inTableData, 'this.sizeForm')
+    //         this.sizeForm.inTableData = handledDetailList;
+
     //       } catch (error) {
     //         this.$message.error("获取详情数据失败");
     //       }
-
+    //     }
+    //   },
     // 选项选择
     radioChange() {
       this.sizeForm.inTableData = []
       this.sizeForm.optionType = '';
+      this.inBatchDialogVisible = false;
+      this.consumableVisible = false;
+      this.batchSelectionVisible = false;
+      this.batchTableData = [];
       if (this.sizeForm.options === 1) {
         this.getQuarterList()
         this.inBatchDialogVisible = true

src/views/firstOrder/outbound.vue

@@ -8,15 +8,7 @@
       <template slot-scope="scope" slot="menuLeft">
         <el-button size="small"  type="primary"  @click="handleDesign()">新增出库单
         </el-button>
-        <!-- <el-button size="small" plain @click="handleExport()">出库单导出
-        </el-button> -->
       </template>
-      <!-- <template slot-scope="scope" slot="purchaseEndInfo">
-        <el-button type="text" @click.stop="purchaseFn(scope.row)" 
-          v-if="scope.row.purchaseEndInfo != '无'">
-          {{scope.row.purchaseEndInfo }}</el-button>
-          <span>{{ scope.row.purchaseEndInfo || '无' }}</span>
-      </template> -->
       <template slot-scope="scope" slot="demandEndInfo">
         <el-button
           type="text"
@@ -38,7 +30,7 @@
 
     <!-- 需求单明细 -->
     <needDialog :showDialog="purchaseOpen" v-if="purchaseOpen" @closeDialog="closeDialog"
-      :purchaseTitle="purchaseTitle">
+      :purchaseTitle="purchaseTitle" :id="id">
     </needDialog>
   </basic-container>
 </template>
@@ -240,6 +232,7 @@ export default {
       this.purchaseOpen = true
       this.purchaseTitle = row.demandEndInfo + '需求单详情'
       this.id = row.id
+      console.log(this.id,'需求单的id')
     },
     closeDialog() {
       this.purchaseOpen = false