1

src/views/modules/noOrderIssue/newNoOrderIssueNotify.vue

@@ -99,9 +99,9 @@
           <el-col :span="10">
             <el-form-item label="订单类型">
               <el-radio-group v-model="orderType" size="small">
-                <el-radio label="shoporder">shoporder</el-radio>
-                <el-radio label="slittingorder">slittingorder</el-radio>
-                <el-radio label="shipment">shipment</el-radio>
+                <el-radio label="slittingorder">分切订单</el-radio>
+                <el-radio label="shipment">销售发货</el-radio>
+                <el-radio label="shoporder">成品订单</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -212,7 +212,7 @@
             <el-form-item label=" ">
               <el-button type="primary" @click="openSelectMaterialModalForDetail()"
               class="">添加</el-button>
-            </el-form-item>  
+            </el-form-item>
           </el-col>
         </el-row>
       </el-form>
@@ -363,7 +363,7 @@ import {
   saveSOIssueNotifyOrderList,
   deleteNotifySOS,
   searchNotifyMaterialListNew,
-  
+
 } from '@/api/orderIssure/soIssueNotify.js'
 import Chooselist from '@/views/modules/common/Chooselist_eam'
 import {
@@ -410,7 +410,6 @@ export default {
       dataList2: [],
       dataList3: [],
       materialDetailList: [],
-      materialDetailColumnList: [],
       currentRow: '',
       dataListLoading: false,
       // 是否收藏
@@ -1068,7 +1067,7 @@ export default {
       availableMaterialLimit: 100, // 每页条数
       availableMaterialTotal: 0, // 总条数
       componentPartNo: '', // 物料编码搜索
-      orderType: 'shoporder',
+      orderType: 'slittingorder',
       // 申请明细弹框相关
       isMaterialDetailModal: false, // 标识是否从申请明细弹框打开选择物料弹框
       clickrow:{},
@@ -1650,7 +1649,7 @@ export default {
     // 打开选择物料弹框
     openSelectMaterialModal() {
       this.isMaterialDetailModal = false // 标识从新增工单物料弹框打开
-      
+
       // 设置模板编号和名称
       this.modelCode = this.seqNoData.orderNo
       this.modelName = this.seqNoData.releaseNo
@@ -1684,7 +1683,7 @@ export default {
               const selectedPartNos = this.selectedMaterialList.map(
                 (item) => item.partNo || item.componentPartNo
               )
-              
+
               // 如果是从申请明细弹框打开的，还需要过滤掉sobomList中已存在的物料
               if (this.isMaterialDetailModal && this.sobomList && this.sobomList.length > 0) {
                 const sobomPartNos = this.sobomList.map(
@@ -1807,7 +1806,7 @@ export default {
     // 确认选择物料
     confirmSelectMaterial() {
       if (this.isMaterialDetailModal) {
-        
+
         // 从申请明细弹框打开的情况，将右侧"已有物料"列表的完整数据更新到sobomList
         const selectedItems = JSON.parse(JSON.stringify(this.selectedMaterialList))
         // 将选中的物料转换为sobomList需要的格式
@@ -1828,7 +1827,7 @@ export default {
         // 将右侧"已有物料"列表的完整数据替换sobomList（包括原有和新增的）
         this.sobomList = selectedItems
         console.log("this.sobomList", this.sobomList);
-        
+
         this.isMaterialDetailModal = false
       } else {
         // 从新增工单物料弹框打开的情况，将数据添加到seqNoList