diff --git a/ayanova/src/views/inv-purchase-order.vue b/ayanova/src/views/inv-purchase-order.vue
index 72839b88..b1c908dd 100644
--- a/ayanova/src/views/inv-purchase-order.vue
+++ b/ayanova/src/views/inv-purchase-order.vue
@@ -305,31 +305,62 @@
         :size="60"
       ></v-progress-circular>
     </template>
-    <v-row justify="center">
-      <v-dialog v-model="editPoItemDialog" persistent>
-        <v-card>
-          <v-card-title>
-            <span class="headline">{{ $ay.t("FindAndReplace") }}</span>
-          </v-card-title>
-          <v-card-text>
-            form here
-            {{ obj.items[editPoItemIndex] }}
-          </v-card-text>
-          <v-card-actions>
-            <v-spacer></v-spacer>
-            <v-btn
-              color="blue darken-1"
-              text
-              @click="editPoItemDialog = false"
-              >{{ $ay.t("Cancel") }}</v-btn
-            >
-            <v-btn color="blue darken-1" text @click="submit()">{{
-              $ay.t("Save")
-            }}</v-btn>
-          </v-card-actions>
-        </v-card>
-      </v-dialog>
-    </v-row>
+    <template v-if="obj.items.length">
+      <v-row justify="center">
+        <v-dialog v-model="editPoItemDialog" persistent>
+          <v-card>
+            <v-card-title>
+              <span class="headline">{{ $ay.t("FindAndReplace") }}</span>
+            </v-card-title>
+            <v-card-text>
+              <v-row>
+                <v-col cols="12" sm="6" lg="4" xl="3">
+                  <gz-pick-list
+                    :aya-type="ayaTypes().Part"
+                    :show-edit-icon="true"
+                    v-model="obj.items[editPoItemIndex].partId"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('Part')"
+                    ref="partId"
+                    data-cy="partId"
+                  ></gz-pick-list>
+                </v-col>
+                <v-col cols="12" sm="6" lg="4" xl="3">
+                  <v-text-field
+                    v-model="obj.items[editPoItemIndex].vendorPartNumber"
+                    :readonly="formState.readOnly"
+                    :clearable="!formState.readOnly"
+                    @click:clear="fieldValueChanged('vendorPartNumber')"
+                    :label="$ay.t('VendorPartNumber')"
+                    ref="vendorPartNumber"
+                    data-cy="vendorPartNumber"
+                    :rules="[form().required(this, 'vendorPartNumber')]"
+                  ></v-text-field>
+                  <!--  maybe don't need this in these sub forms as they are all to do with server related errors which isn't currently supportive of indexed collection children  :error-messages="
+                    
+                    //YAGNI FOR NOW
+                    form().serverErrors(this, 'vendorPartNumber')
+                  " @input="fieldValueChanged('vendorPartNumber')"  -->
+                </v-col>
+              </v-row>
+              {{ obj.items[editPoItemIndex] }}
+            </v-card-text>
+            <v-card-actions>
+              <v-spacer></v-spacer>
+              <v-btn
+                color="blue darken-1"
+                text
+                @click="editPoItemDialog = false"
+                >{{ $ay.t("Cancel") }}</v-btn
+              >
+              <v-btn color="blue darken-1" text @click="submit()">{{
+                $ay.t("Save")
+              }}</v-btn>
+            </v-card-actions>
+          </v-card>
+        </v-dialog>
+      </v-row>
+    </template>
   </div>
 </template>