2026-01-13

过站采集页面创建分卷的固定载具清单加【新增】按钮

src/views/modules/yieldReport/com_separate_roll.vue

@@ -144,6 +144,7 @@
             <el-button type="primary" @click="queryFixedCarrierList">查询</el-button>
             <el-button v-if="!editBatchVisible" @click="editBatchModel" type="success" icon="el-icon-edit">批量编辑</el-button>
             <el-button v-if="editBatchVisible" @click="batchSaveCarrier" type="primary" icon="el-icon-check" :loading="saveLoading">批量保存</el-button>
+            <el-button type="success" icon="el-icon-plus" @click="addCarrierModal">新增</el-button>
           </el-form-item>
         </el-form>
         <el-table
@@ -159,6 +160,13 @@
             align="left"
             min-width="120">
           </el-table-column>
+          <el-table-column
+            prop="carrierTypeCode"
+            label="载具类型编码"
+            header-align="center"
+            align="left"
+            min-width="120">
+          </el-table-column>
           <el-table-column
             prop="carrierTypeName"
             label="载具类型名称"
@@ -219,6 +227,71 @@
         <el-button type="primary" @click="carrierModelFlag=false">关闭</el-button>
       </el-footer>
     </el-dialog>
+
+    <!-- 新增固定载具对话框 -->
+    <el-dialog title="新增固定载具" :close-on-click-modal="false" v-drag :visible.sync="addCarrierFlag" width="487px">
+      <el-form ref="addCarrierForm" :inline="true" label-position="top" :model="addCarrierData" :rules="addCarrierRules" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="状态" prop="status">
+          <el-select v-model="addCarrierData.status" placeholder="请选择" style="width: 120px">
+            <el-option label="空闲" :value="1"></el-option>
+            <el-option label="占用" :value="2"></el-option>
+            <el-option label="维修" :value="3"></el-option>
+            <el-option label="报废" :value="4"></el-option>
+            <el-option label="外借" :value="5"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="addCarrierData" :rules="addCarrierRules" style="margin-left: 7px">
+        <el-form-item label="载具类型编码" prop="carrierTypeCode">
+          <el-input v-model="addCarrierData.carrierTypeCode" style="width: 150px"></el-input>
+        </el-form-item>
+        <el-form-item label="载具类型名称" prop="carrierTypeName">
+          <el-input v-model="addCarrierData.carrierTypeName" style="width: 285px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="addCarrierData" style="margin-left: 7px">
+        <el-form-item label="固定资产编号">
+          <el-input v-model="addCarrierData.assetNo" style="width: 150px"></el-input>
+        </el-form-item>
+        <el-form-item label="规格描述">
+          <el-input v-model="addCarrierData.specification" style="width: 285px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="addCarrierData" style="margin-left: 7px">
+        <el-form-item label="采购日期">
+          <el-date-picker v-model="addCarrierData.purchaseDate" type="date" value-format="yyyy-MM-dd" style="width: 150px"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="当前位置">
+          <el-input v-model="addCarrierData.currentLocation" style="width: 150px"></el-input>
+        </el-form-item>
+        <el-form-item label="尺寸">
+          <el-input v-model="addCarrierData.dimensions" style="width: 120px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="addCarrierData" style="margin-left: 7px">
+        <el-form-item label="可用数量">
+          <el-input-number v-model="addCarrierData.availableQty" :controls="false" style="width: 102px"></el-input-number>
+        </el-form-item>
+        <el-form-item label="最大承重">
+          <el-input-number v-model="addCarrierData.maxWeight" :controls="false" style="width: 102px"></el-input-number>
+        </el-form-item>
+        <el-form-item label="预期使用次数">
+          <el-input-number v-model="addCarrierData.expectedLifeCycles" :controls="false" style="width: 102px"></el-input-number>
+        </el-form-item>
+        <el-form-item label="预期使用寿命">
+          <el-input-number v-model="addCarrierData.expectedLifeDays" :controls="false" style="width: 101px"></el-input-number>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="addCarrierData" style="margin-left: 7px">
+        <el-form-item label="备注">
+          <el-input type="textarea" v-model="addCarrierData.remark" :rows="3" resize='none' show-word-limit style="width: 450px;height: 30px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:35px;margin-top: 55px;text-align:center">
+        <el-button type="primary" :loading="addCarrierLoading" @click="saveAddCarrier">保存</el-button>
+        <el-button @click="addCarrierFlag=false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
   </div>
 </template>
 
@@ -233,6 +306,7 @@
     validateShiftChangeDataCount,/*校验数据条数*/
     saveAbnormalRollData,/*保存异常截卷数据*/
   } from '@/api/yieldReport/com_separate_roll.js';
+  import { fixedCarrierSave } from '@/api/fixedCarrier/fixedCarrier.js';
 
   /*打印标签专用的js*/
   import {
@@ -336,6 +410,31 @@ export default {
       },
       editBatchVisible: false,  // 批量编辑状态
       saveLoading: false,  // 保存loading状态
+      // 新增固定载具相关
+      addCarrierFlag: false,
+      addCarrierLoading: false,
+      addCarrierData: {
+        bu: '',
+        site: '',
+        buNo: '',
+        carrierTypeCode: '',
+        carrierTypeName: '',
+        assetNo: '',
+        specification: '',
+        purchaseDate: null,
+        currentLocation: '',
+        dimensions: '',
+        availableQty: null,
+        maxWeight: null,
+        expectedLifeCycles: null,
+        expectedLifeDays: null,
+        status: 1,
+        remark: ''
+      },
+      addCarrierRules: {
+        carrierTypeCode: [{ required: true, message: '请输入载具类型编码', trigger: 'blur' }],
+        carrierTypeName: [{ required: true, message: '请输入载具类型名称', trigger: 'blur' }]
+      },
       hasCachedData: false,  // 是否有缓存数据
       cachedDataCount: 0,    // 缓存数据条数
       cachedRowDataList: [],  // 缓存的原始行数据（用于校验）
@@ -1055,6 +1154,52 @@ export default {
       })
     },
 
+    // 打开新增固定载具对话框
+    addCarrierModal() {
+      console.log(this.scheduleData)
+      this.addCarrierData = {
+        bu: this.scheduleData.site + '_' + this.scheduleData.buNo || '',
+        site: this.scheduleData.site || '',
+        buNo: this.scheduleData.buNo || '',
+        carrierTypeCode: '',
+        carrierTypeName: '',
+        assetNo: '',
+        specification: '',
+        purchaseDate: null,
+        currentLocation: '',
+        dimensions: '',
+        availableQty: null,
+        maxWeight: null,
+        expectedLifeCycles: null,
+        expectedLifeDays: null,
+        status: 1,
+        remark: ''
+      };
+      this.addCarrierFlag = true;
+    },
+
+    // 保存新增固定载具
+    saveAddCarrier() {
+      this.$refs.addCarrierForm.validate((valid) => {
+        if (valid) {
+          this.addCarrierLoading = true;
+          fixedCarrierSave(this.addCarrierData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.$message.success('新增成功');
+              this.addCarrierFlag = false;
+              this.queryFixedCarrierList();
+            } else {
+              this.$message.error(data.msg || '新增失败');
+            }
+          }).catch(error => {
+            this.$message.error('新增失败: ' + error.message);
+          }).finally(() => {
+            this.addCarrierLoading = false;
+          });
+        }
+      });
+    },
+
     // 打印固定载具
     printCarrier(row) {
       const LODOP = getLodop()