提交

src/views/business/firstOutsource/DialogFurnaceNoInfo.vue

@@ -12,7 +12,7 @@
 
     <el-table ref="dialogTable" :data="productList" size="small" v-loading="loading" border height="370px"
       @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="40" align="center" />
+      <!-- <el-table-column type="selection" width="40" align="center" /> -->
       <el-table-column label="序号" width="56" align="center" type="index" />
       <el-table-column label="材料厂家" align="center" prop="factory" />
       <el-table-column label="炉号" align="center" prop="furnaceNumber" />
@@ -22,18 +22,23 @@
       <el-table-column label="形状" align="center" prop="shape" />
       <el-table-column label="来料日期" align="center" prop="incomingDate" />
       <el-table-column label="原料编码" align="center" prop="rawMaterialCode" />
+      <el-table-column label="操作" align="center" prop="rawMaterialCode">
+        <template #default="scope">
+          <el-button type="success" icon="finished" circle @click="handleSingleSelected(scope.row)" />
+        </template>
+      </el-table-column>
     </el-table>
     <!-- 分页 -->
     <!-- <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
       v-model:limit="queryParams.pageSize" @pagination="getList" /> -->
-    <template #footer>
+    <!-- <template #footer>
       <div class="dialog-footer">
         <el-button type="primary" icon="Check" :disabled="selections.length === 0" @click="handleMultipleSelected">
           确 定
         </el-button>
         <el-button type="danger" icon="Close" @click="close">取 消</el-button>
       </div>
-    </template>
+    </template> -->
   </el-dialog>
 </template>
 <script setup>
@@ -90,8 +95,7 @@ function close() {
 function getList() {
   loading.value = true;
   getFurnaceNoInfo(queryParams.value).then((res) => {
-    productList.value = res.rows;
-    total.value = res.total;
+    productList.value = res.data;
     loading.value = false;
   });
 }
@@ -115,6 +119,13 @@ function handleMultipleSelected() {
   close();
 }
 
+function handleSingleSelected(row) {
+  if (singleSelected.value) {
+    singleSelected.value(details.value, row);
+  }
+  close();
+}
+
 defineExpose({
   open,
 });

src/views/business/firstOutsource/form.vue

@@ -139,8 +139,9 @@
             <el-table-column label="炉号" align="center" prop="" width="150">
               <template #default="scope">
                 <el-button link type="primary" icon="Refresh" v-if="editStatus"
-                  @click="handleChoiceFurnaceNoInfo(scope.row)">{{ scope.row.furnaceNoInfoId ? scope.row.furnaceNumber :
-    '选择炉号' }}</el-button>
+                  @click="handleChoiceFurnaceNoInfo(scope.row)">
+                  {{ scope.row.furnaceNoInfo != null ? scope.row.furnaceNoInfo.furnaceNumber : '选择炉号' }}
+                </el-button>
                 <span v-else>{{ scope.row.furnaceNumber }}</span>
               </template>
             </el-table-column>
@@ -786,25 +787,27 @@ function handleSelectionChange(selection) {
 // 选择炉号
 const handleChoiceFurnaceNoInfo = (row) => {
   // 判断选择的产品是不是同一个
-  const changeFurnacheNoInfo = row ? [row] : selections.value;
+  const changeFurnaceNoInfo = row ? [row] : selections.value;
   let checkSame = true
-  changeFurnacheNoInfo.forEach(l => {
-    checkSame = checkSame && l.productId == changeFurnacheNoInfo[0].productId
+  changeFurnaceNoInfo.forEach(l => {
+    checkSame = checkSame && l.productId == changeFurnaceNoInfo[0].productId
   })
   console.log(checkSame)
   if (!checkSame) {
     proxy.$modal.msgError('请选择相同计划单批量选择炉号')
     return
   }
-  if (changeFurnacheNoInfo.length === 0) {
+  if (changeFurnaceNoInfo.length === 0) {
     proxy.$modal.msgError('请选择需要变更炉号的计划单')
     return
   }
-  dialogFurnaceNoInfoRef.value.open({ details: changeFurnacheNoInfo, queryParams: { ...changeFurnacheNoInfo[0] } })
+  dialogFurnaceNoInfoRef.value.open({ details: changeFurnaceNoInfo, queryParams: { ...changeFurnaceNoInfo[0] } })
 }
 
-const handleSingleSelectFurnaceNoInfo = (info) => {
-
+const handleSingleSelectFurnaceNoInfo = (details, info) => {
+  details.forEach(l => {
+    l.furnaceNoInfo = info
+  })
 }
 
 /** 暴露给父组件的方法 */