Merge remote-tracking branch 'origin/master'

src/views/wms/outstockOrderCopy/index.vue

@@ -94,7 +94,7 @@
             <el-button
               size="small"
               type="warning"
-              v-if="scope.row.needApprove &amp;&amp; (scope.row.auditStatus === null || scope.row.auditStatus === undefined || scope.row.auditStatus === '')"
+              v-if="scope.row.needApprove &amp;&amp; (scope.row.auditStatus === null || scope.row.auditStatus === undefined || scope.row.auditStatus === '' || scope.row.auditStatus === '0' )"
               @click.stop="openApprove(scope.row)"
             >审批</el-button>
             <el-button size="small" @click.stop="parentTableUpdate(scope.row)">
@@ -842,7 +842,8 @@ const dialogSubmit = async () => {
       materialSpe: item.materialSpe || item.materialSpec, // 前端 materialSpec -> 后端 materialSpe
       unitName: item.materialUnit,   // 前端 materialUnit -> 后端 unitName
       outstockQty: Number(item.outstockQty || 0),
-      materialCategoryId: dialogForm.value.materialCategoryId
+      materialCategoryId: dialogForm.value.materialCategoryId,
+      isHighValue: item.isHighValue,
     }))
     .filter(d => d.materialCode && Number(d.outstockQty) > 0);
 
@@ -964,6 +965,7 @@ const submitMaterialForm = () => {
         dialogtable.value[currentRowIndex.value].materialCode = selectedMaterial.value.materialCode;
         dialogtable.value[currentRowIndex.value].unitName = selectedMaterial.value.materialUnit;
         dialogtable.value[currentRowIndex.value].materialSpe = selectedMaterial.value.materialSpec;
+        dialogtable.value[currentRowIndex.value].isHighValue = selectedMaterial.value.isHighValue;
         // 可以根据需要添加更多字段
       }
     }