Merge branch 'master' of http://120.46.159.163:7400/ezhizao/ezhizao_dms_vue

src/views/business/inventoryCheck/form.vue

@@ -77,6 +77,7 @@
                             </template>
                         </el-table-column>
             <el-table-column label="工段" align="center" prop="deptName" width="100" />
+            <el-table-column label="工序" align="center" prop="processAlias" width="110" />
             <el-table-column label="投入数" align="center" prop="prodNum" width="96" />
             <el-table-column label="盘点数量" align="center" prop="taksStockNum" width="96" >
               <template #default="scope">
@@ -149,7 +150,7 @@
                 icon="Edit"
                   v-else
                   type="warning"
-                  @click="() => (scope.row.editStatus = true)"
+                  @click="handleEdit(scope.row,scope.$index)"
                   v-hasPermi="['business:inventoryCheck:editDetail']"
                   >编辑</el-button
                 >
@@ -232,6 +233,14 @@ function getList() {
     total.value = res.total;
   })
 }
+function handleEdit(row,index) {
+  row.editStatus = true
+  console.log(row);
+  if(row.isTaksStock != 1) {
+    row.taksStockNum = row.prodNum
+  }
+  console.log(row)
+}
 function handleSave(row) {
   updateTaksStockLot(row).then(res =>{
     if(res.code == 200){

src/views/business/inventoryCheck/index.vue

@@ -223,9 +223,9 @@ function handleQuery() {
 function handleCancel(row,index) {
     if(row.id) {
         takeStockPeriodList.value[index].editStatus = false    
-    }else {
-        getTakeStockPeriodList()
     }
+        getTakeStockPeriodList()
+    
   
  
 }